From 70eea6dd37b40766ed7b89c88e0d9c68eeab0c84 Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:54:52 +0700 Subject: [PATCH 1/7] Update translate --- ui/ui/app-localisation.tpl | 10 ++++++-- ui/ui/app-notifications.tpl | 8 +++---- ui/ui/app-settings.tpl | 10 ++++---- ui/ui/balance-add.tpl | 4 ++-- ui/ui/balance-edit.tpl | 4 ++-- ui/ui/bandwidth.tpl | 4 ++-- ui/ui/change-password.tpl | 2 +- ui/ui/community.tpl | 47 ++++++++++++++++++------------------- ui/ui/customers-add.tpl | 6 ++--- ui/ui/customers-edit.tpl | 2 +- ui/ui/customers-view.tpl | 3 +-- 11 files changed, 52 insertions(+), 48 deletions(-) diff --git a/ui/ui/app-localisation.tpl b/ui/ui/app-localisation.tpl index 44335e18..e16e70f5 100644 --- a/ui/ui/app-localisation.tpl +++ b/ui/ui/app-localisation.tpl @@ -3,9 +3,15 @@
-
{Lang::T('Localisation')}
+
+
+ +
+ {Lang::T('Localisation')} +
+
-
diff --git a/ui/ui/app-notifications.tpl b/ui/ui/app-notifications.tpl index 94e9e299..7dc158f9 100644 --- a/ui/ui/app-notifications.tpl +++ b/ui/ui/app-notifications.tpl @@ -16,8 +16,8 @@
+ placeholder="{Lang::T('Hello')} [[name]], {Lang::T('your internet package')} [[package]] {Lang::T('has been expired')}" + rows="4">{if $_json['expired']!=''}{Lang::htmlspecialchars($_json['expired'])}{else}{Lang::T('Hello')} [[name]], {Lang::T('your internet package')} [[package]] {Lang::T('has been expired')}.{/if}

[[name]] - {Lang::T('will be replaced with Customer Name')}.
@@ -84,7 +84,7 @@

@@ -112,7 +112,7 @@

diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index 55b9af70..fc756631 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -755,7 +755,7 @@

- Github Authentication + Github {Lang::T('Authentication')}
@@ -776,13 +776,13 @@ onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
Create GitHub personal access token (classic), only need repo - scope + target="_blank">{Lang::T('Create GitHub personal access token')} (classic), {Lang::T('only need repo + scope')}
-
diff --git a/ui/ui/balance-add.tpl b/ui/ui/balance-add.tpl index d74efbfb..828c1d1f 100644 --- a/ui/ui/balance-add.tpl +++ b/ui/ui/balance-add.tpl @@ -10,10 +10,10 @@
diff --git a/ui/ui/balance-edit.tpl b/ui/ui/balance-edit.tpl index a8bc0ecf..2603f61c 100644 --- a/ui/ui/balance-edit.tpl +++ b/ui/ui/balance-edit.tpl @@ -11,10 +11,10 @@
diff --git a/ui/ui/bandwidth.tpl b/ui/ui/bandwidth.tpl index 078ed15a..0647747e 100644 --- a/ui/ui/bandwidth.tpl +++ b/ui/ui/bandwidth.tpl @@ -57,8 +57,8 @@ {include file="pagination.tpl"}
-

Create Bandwitdh Plan for expired Internet Plan

-

When customer expired, you can move it to Expired Internet Plan

+

{Lang::T('Create Bandwitdh Plan for expired Internet Plan')}

+

{Lang::T('When customer expired, you can move it to Expired Internet Plan')}

diff --git a/ui/ui/change-password.tpl b/ui/ui/change-password.tpl index e8e630aa..0257496e 100644 --- a/ui/ui/change-password.tpl +++ b/ui/ui/change-password.tpl @@ -28,7 +28,7 @@
- Or {Lang::T('Cancel')} + {Lang::T('Or')} {Lang::T('Cancel')}
diff --git a/ui/ui/community.tpl b/ui/ui/community.tpl index 4f96379d..f582b15e 100644 --- a/ui/ui/community.tpl +++ b/ui/ui/community.tpl @@ -10,7 +10,7 @@
-

Contributors

+

{Lang::T('Contributors')}

@@ -22,29 +22,29 @@
-

Discussions

+

{Lang::T('Discussions')}

-
Get help from community
+
{Lang::T('Get help from community')}
Github - Discussions + class="btn btn-primary btn-sm btn-block"> {Lang::T('Github + Discussions')} Telegram Group + class="ion ion-chatboxes"> {Lang::T('Telegram Group')}
-

Feedback

+

{Lang::T('')}Feedback

- Feedback and Bug Report + {Lang::T('Feedback and Bug Report')}
Give Feedback + class="btn btn-primary btn-sm btn-block"> {Lang::T('Give Feedback')}
@@ -131,19 +131,19 @@
-

Chat with me

+

{Lang::T('Chat with me')}

-
$50 Paid Support
donation confirmation?
Or ask any Donation Alternative
+
{Lang::T('$50 Paid Support
donation confirmation?')}
{Lang::T('Or ask any Donation Alternative')}
Telegram
-

Free WhatsApp Gateway and Telegram Bot creater

+

{Lang::T('Free')} WhatsApp {Lang::T('Gateway and Telegram Bot creater')}

- There is a Telegram bot wizard in here + {Lang::T('There is a Telegram bot wizard in here')}
PHPNUXBILL
- PHPNuxBill is a billing Hotspot and PPPOE for Mikrotik using PHP and Mikrotik API to comunicate - with router. If you get more profit with this application, please donate us.
Watch project PHPNuxBill {Lang::T('is a billing Hotspot and PPPOE for Mikrotik using PHP and Mikrotik API to comunicate + with router. If you get more profit with this application, please donate us.')}
{Lang::T('Watch project')} in here
- Install Latest Version + {Lang::T('Install Latest Version')} Download Latest Version + class="btn btn-warning btn-sm btn-block text-black">{Lang::T('Download Latest Version')}
-
Select Old Version +
{Lang::T('Select Old Version')}
- Current - Changelog + {Lang::T('Current Changelog')} Repo Changelog + class="btn btn-default btn-sm btn-block">{Lang::T('Repo Changelog')}
- If you Download manual the update file, sometime update change database, after uploading, click this - button to update database structure. - Update Database + {Lang::T('If you Download manual the update file, sometime update change database, after uploading, click this + button to update database structure.')} + {Lang::T('Update')} Database
diff --git a/ui/ui/customers-add.tpl b/ui/ui/customers-add.tpl index e3b97517..1b0a97b6 100644 --- a/ui/ui/customers-add.tpl +++ b/ui/ui/customers-add.tpl @@ -70,7 +70,7 @@ - +
@@ -78,9 +78,9 @@
diff --git a/ui/ui/customers-edit.tpl b/ui/ui/customers-edit.tpl index 463a9564..2941898e 100644 --- a/ui/ui/customers-edit.tpl +++ b/ui/ui/customers-edit.tpl @@ -164,7 +164,7 @@ {/foreach} diff --git a/ui/ui/customers-view.tpl b/ui/ui/customers-view.tpl index 77f9632a..f1840ca9 100644 --- a/ui/ui/customers-view.tpl +++ b/ui/ui/customers-view.tpl @@ -100,8 +100,7 @@
  • {Lang::T('Coordinates')} Get - Directions + href="https://www.google.com/maps/dir//{$d['coordinates']}/" target="_blank">{Lang::T('Get Directions')}
    • From d496d89f959c26cb0110fbd4e0f7beaaf4ae54a6 Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:19:01 +0700 Subject: [PATCH 2/7] Update community.tpl --- ui/ui/community.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/ui/community.tpl b/ui/ui/community.tpl index f582b15e..894c49ee 100644 --- a/ui/ui/community.tpl +++ b/ui/ui/community.tpl @@ -133,14 +133,14 @@

    {Lang::T('Chat with me')}

    -
    {Lang::T('$50 Paid Support
    donation confirmation?')}
    {Lang::T('Or ask any Donation Alternative')}
    +
    {Lang::T('$50 Paid Support')}
    {Lang::T('donation confirmation?')}
    {Lang::T('Or ask any Donation Alternative')}
    Telegram
    -

    {Lang::T('Free')} WhatsApp {Lang::T('Gateway and Telegram Bot creater')}

    +

    {Lang::T('Free WhatsApp Gateway and Telegram Bot creater')}

    {Lang::T('There is a Telegram bot wizard in here')} @@ -159,7 +159,7 @@
    PHPNuxBill {Lang::T('is a billing Hotspot and PPPOE for Mikrotik using PHP and Mikrotik API to comunicate with router. If you get more profit with this application, please donate us.')}
    {Lang::T('Watch project')} in here + href="https://github.com/hotspotbilling/phpnuxbill" target="_blank">{Lang::T('in here')}
    @@ -182,7 +182,7 @@
    {Lang::T('If you Download manual the update file, sometime update change database, after uploading, click this button to update database structure.')} - {Lang::T('Update')} Database + {Lang::T('Update Database')}
    @@ -199,4 +199,4 @@ }); }); -{include file="sections/footer.tpl"} \ No newline at end of file +{include file="sections/footer.tpl"} From 5070cd9ed719d4711f39599f21684b1fa0c5a363 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Fri, 16 Aug 2024 09:35:25 +0700 Subject: [PATCH 3/7] set customer language to cookie --- init.php | 2 ++ ui/ui/sections/user-footer.tpl | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/init.php b/init.php index c33acdfc..a4edd798 100644 --- a/init.php +++ b/init.php @@ -134,6 +134,8 @@ if ((!empty($radius_user) && $config['radius_enable']) || _post('radius_enable') // Check if the user has selected a language if (!empty($_SESSION['user_language'])) { $config['language'] = $_SESSION['user_language']; +}else if (!empty($_COOKIE['user_language'])) { + $config['language'] = $_COOKIE['user_language']; } if (empty($_SESSION['Lang'])) { diff --git a/ui/ui/sections/user-footer.tpl b/ui/ui/sections/user-footer.tpl index b6017e68..bda37fc4 100644 --- a/ui/ui/sections/user-footer.tpl +++ b/ui/ui/sections/user-footer.tpl @@ -108,6 +108,28 @@ }) }); }); + + function setCookie(name, value, days) { + var expires = ""; + if (days) { + var date = new Date(); + date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); + expires = "; expires=" + date.toUTCString(); + } + document.cookie = name + "=" + (value || "") + expires + "; path=/"; + } + + function getCookie(name) { + var nameEQ = name + "="; + var ca = document.cookie.split(';'); + for (var i = 0; i < ca.length; i++) { + var c = ca[i]; + while (c.charAt(0) == ' ') c = c.substring(1, c.length); + if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length); + } + return null; + } + setCookie('user_language', '{/literal}{$user_language}{literal}', 365); {/literal} From 5242b19f6f6f20f75523f92f2ee6336363165962 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Sat, 17 Aug 2024 11:18:30 +0700 Subject: [PATCH 4/7] 10 minutes for request resend OTP, 20 minutes for expired --- system/controllers/accounts.php | 4 ++-- system/controllers/register.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/controllers/accounts.php b/system/controllers/accounts.php index 1c40cef8..06ec95ae 100644 --- a/system/controllers/accounts.php +++ b/system/controllers/accounts.php @@ -153,8 +153,8 @@ switch ($action) { $phoneFile = $otpPath . sha1($username . $db_pass) . "_phone.txt"; // expired 10 minutes - if (file_exists($otpFile) && time() - filemtime($otpFile) < 1200) { - r2(U . 'accounts/phone-update', 'e', Lang::T('Please wait ' . (1200 - (time() - filemtime($otpFile))) . ' seconds before sending another SMS')); + if (file_exists($otpFile) && time() - filemtime($otpFile) < 600) { + r2(U . 'accounts/phone-update', 'e', Lang::T('Please wait ' . (600 - (time() - filemtime($otpFile))) . ' seconds before sending another SMS')); } else { $otp = rand(100000, 999999); file_put_contents($otpFile, $otp); diff --git a/system/controllers/register.php b/system/controllers/register.php index 25e41480..9a432edf 100644 --- a/system/controllers/register.php +++ b/system/controllers/register.php @@ -124,9 +124,9 @@ switch ($do) { } $otpPath .= sha1($username . $db_pass) . ".txt"; //expired 10 minutes - if (file_exists($otpPath) && time() - filemtime($otpPath) < 1200) { + if (file_exists($otpPath) && time() - filemtime($otpPath) < 600) { $ui->assign('username', $username); - $ui->assign('notify', 'Please wait ' . (1200 - (time() - filemtime($otpPath))) . ' seconds before sending another SMS'); + $ui->assign('notify', 'Please wait ' . (600 - (time() - filemtime($otpPath))) . ' seconds before sending another SMS'); $ui->assign('notify_t', 'd'); $ui->display('register-otp.tpl'); } else { From 5c30be70c00fb24e44a9a270c6c20a7ef018f28b Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Sat, 17 Aug 2024 22:18:15 +0700 Subject: [PATCH 5/7] change from niceedit to summernet, it support table --- system/autoload/Lang.php | 2 +- ui/ui/page-edit.tpl | 21 +- ui/ui/sections/footer.tpl | 1 + ui/ui/sections/header.tpl | 1 + ui/ui/summernote/font/summernote.eot | Bin 0 -> 12072 bytes ui/ui/summernote/font/summernote.ttf | Bin 0 -> 11896 bytes ui/ui/summernote/font/summernote.woff | Bin 0 -> 7428 bytes ui/ui/summernote/font/summernote.woff2 | Bin 0 -> 6156 bytes ui/ui/summernote/lang/summernote-ar-AR.js | 274 +++++++++++++++++ ui/ui/summernote/lang/summernote-ar-AR.min.js | 2 + .../lang/summernote-ar-AR.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-az-AZ.js | 283 ++++++++++++++++++ ui/ui/summernote/lang/summernote-az-AZ.min.js | 2 + .../lang/summernote-az-AZ.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-bg-BG.js | 274 +++++++++++++++++ ui/ui/summernote/lang/summernote-bg-BG.min.js | 2 + .../lang/summernote-bg-BG.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-ca-ES.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-ca-ES.min.js | 2 + .../lang/summernote-ca-ES.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-cs-CZ.js | 268 +++++++++++++++++ ui/ui/summernote/lang/summernote-cs-CZ.min.js | 2 + .../lang/summernote-cs-CZ.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-da-DK.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-da-DK.min.js | 2 + .../lang/summernote-da-DK.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-de-DE.js | 274 +++++++++++++++++ ui/ui/summernote/lang/summernote-de-DE.min.js | 2 + .../lang/summernote-de-DE.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-el-GR.js | 281 +++++++++++++++++ ui/ui/summernote/lang/summernote-el-GR.min.js | 2 + .../lang/summernote-el-GR.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-es-ES.js | 280 +++++++++++++++++ ui/ui/summernote/lang/summernote-es-ES.min.js | 2 + .../lang/summernote-es-ES.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-es-EU.js | 272 +++++++++++++++++ ui/ui/summernote/lang/summernote-es-EU.min.js | 2 + .../lang/summernote-es-EU.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-fa-IR.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-fa-IR.min.js | 2 + .../lang/summernote-fa-IR.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-fi-FI.js | 271 +++++++++++++++++ ui/ui/summernote/lang/summernote-fi-FI.min.js | 2 + .../lang/summernote-fi-FI.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-fr-FR.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-fr-FR.min.js | 2 + .../lang/summernote-fr-FR.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-gl-ES.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-gl-ES.min.js | 2 + .../lang/summernote-gl-ES.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-he-IL.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-he-IL.min.js | 2 + .../lang/summernote-he-IL.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-hr-HR.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-hr-HR.min.js | 2 + .../lang/summernote-hr-HR.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-hu-HU.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-hu-HU.min.js | 2 + .../lang/summernote-hu-HU.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-id-ID.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-id-ID.min.js | 2 + .../lang/summernote-id-ID.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-it-IT.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-it-IT.min.js | 2 + .../lang/summernote-it-IT.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-ja-JP.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-ja-JP.min.js | 2 + .../lang/summernote-ja-JP.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-ko-KR.js | 275 +++++++++++++++++ ui/ui/summernote/lang/summernote-ko-KR.min.js | 2 + .../lang/summernote-ko-KR.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-lt-LT.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-lt-LT.min.js | 2 + .../lang/summernote-lt-LT.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-lt-LV.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-lt-LV.min.js | 2 + .../lang/summernote-lt-LV.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-mn-MN.js | 274 +++++++++++++++++ ui/ui/summernote/lang/summernote-mn-MN.min.js | 2 + .../lang/summernote-mn-MN.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-nb-NO.js | 272 +++++++++++++++++ ui/ui/summernote/lang/summernote-nb-NO.min.js | 2 + .../lang/summernote-nb-NO.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-nl-NL.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-nl-NL.min.js | 2 + .../lang/summernote-nl-NL.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-pl-PL.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-pl-PL.min.js | 2 + .../lang/summernote-pl-PL.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-pt-BR.js | 274 +++++++++++++++++ ui/ui/summernote/lang/summernote-pt-BR.min.js | 2 + .../lang/summernote-pt-BR.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-pt-PT.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-pt-PT.min.js | 2 + .../lang/summernote-pt-PT.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-ro-RO.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-ro-RO.min.js | 2 + .../lang/summernote-ro-RO.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-ru-RU.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-ru-RU.min.js | 2 + .../lang/summernote-ru-RU.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-sk-SK.js | 271 +++++++++++++++++ ui/ui/summernote/lang/summernote-sk-SK.min.js | 2 + .../lang/summernote-sk-SK.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-sl-SI.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-sl-SI.min.js | 2 + .../lang/summernote-sl-SI.min.js.LICENSE.txt | 1 + .../summernote/lang/summernote-sr-RS-Latin.js | 273 +++++++++++++++++ .../lang/summernote-sr-RS-Latin.min.js | 2 + .../summernote-sr-RS-Latin.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-sr-RS.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-sr-RS.min.js | 2 + .../lang/summernote-sr-RS.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-sv-SE.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-sv-SE.min.js | 2 + .../lang/summernote-sv-SE.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-ta-IN.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-ta-IN.min.js | 2 + .../lang/summernote-ta-IN.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-th-TH.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-th-TH.min.js | 2 + .../lang/summernote-th-TH.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-tr-TR.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-tr-TR.min.js | 2 + .../lang/summernote-tr-TR.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-uk-UA.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-uk-UA.min.js | 2 + .../lang/summernote-uk-UA.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-uz-UZ.js | 230 ++++++++++++++ ui/ui/summernote/lang/summernote-uz-UZ.min.js | 2 + .../lang/summernote-uz-UZ.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-vi-VN.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-vi-VN.min.js | 2 + .../lang/summernote-vi-VN.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-zh-CN.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-zh-CN.min.js | 2 + .../lang/summernote-zh-CN.min.js.LICENSE.txt | 1 + ui/ui/summernote/lang/summernote-zh-TW.js | 273 +++++++++++++++++ ui/ui/summernote/lang/summernote-zh-TW.min.js | 2 + .../lang/summernote-zh-TW.min.js.LICENSE.txt | 1 + ui/ui/summernote/summernote.min.css | 1 + ui/ui/summernote/summernote.min.js | 3 + .../summernote/summernote.min.js.LICENSE.txt | 1 + ui/ui/summernote/summernote.min.js.map | 1 + 144 files changed, 12136 insertions(+), 17 deletions(-) create mode 100644 ui/ui/summernote/font/summernote.eot create mode 100644 ui/ui/summernote/font/summernote.ttf create mode 100644 ui/ui/summernote/font/summernote.woff create mode 100644 ui/ui/summernote/font/summernote.woff2 create mode 100644 ui/ui/summernote/lang/summernote-ar-AR.js create mode 100644 ui/ui/summernote/lang/summernote-ar-AR.min.js create mode 100644 ui/ui/summernote/lang/summernote-ar-AR.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-az-AZ.js create mode 100644 ui/ui/summernote/lang/summernote-az-AZ.min.js create mode 100644 ui/ui/summernote/lang/summernote-az-AZ.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-bg-BG.js create mode 100644 ui/ui/summernote/lang/summernote-bg-BG.min.js create mode 100644 ui/ui/summernote/lang/summernote-bg-BG.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-ca-ES.js create mode 100644 ui/ui/summernote/lang/summernote-ca-ES.min.js create mode 100644 ui/ui/summernote/lang/summernote-ca-ES.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-cs-CZ.js create mode 100644 ui/ui/summernote/lang/summernote-cs-CZ.min.js create mode 100644 ui/ui/summernote/lang/summernote-cs-CZ.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-da-DK.js create mode 100644 ui/ui/summernote/lang/summernote-da-DK.min.js create mode 100644 ui/ui/summernote/lang/summernote-da-DK.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-de-DE.js create mode 100644 ui/ui/summernote/lang/summernote-de-DE.min.js create mode 100644 ui/ui/summernote/lang/summernote-de-DE.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-el-GR.js create mode 100644 ui/ui/summernote/lang/summernote-el-GR.min.js create mode 100644 ui/ui/summernote/lang/summernote-el-GR.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-es-ES.js create mode 100644 ui/ui/summernote/lang/summernote-es-ES.min.js create mode 100644 ui/ui/summernote/lang/summernote-es-ES.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-es-EU.js create mode 100644 ui/ui/summernote/lang/summernote-es-EU.min.js create mode 100644 ui/ui/summernote/lang/summernote-es-EU.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-fa-IR.js create mode 100644 ui/ui/summernote/lang/summernote-fa-IR.min.js create mode 100644 ui/ui/summernote/lang/summernote-fa-IR.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-fi-FI.js create mode 100644 ui/ui/summernote/lang/summernote-fi-FI.min.js create mode 100644 ui/ui/summernote/lang/summernote-fi-FI.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-fr-FR.js create mode 100644 ui/ui/summernote/lang/summernote-fr-FR.min.js create mode 100644 ui/ui/summernote/lang/summernote-fr-FR.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-gl-ES.js create mode 100644 ui/ui/summernote/lang/summernote-gl-ES.min.js create mode 100644 ui/ui/summernote/lang/summernote-gl-ES.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-he-IL.js create mode 100644 ui/ui/summernote/lang/summernote-he-IL.min.js create mode 100644 ui/ui/summernote/lang/summernote-he-IL.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-hr-HR.js create mode 100644 ui/ui/summernote/lang/summernote-hr-HR.min.js create mode 100644 ui/ui/summernote/lang/summernote-hr-HR.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-hu-HU.js create mode 100644 ui/ui/summernote/lang/summernote-hu-HU.min.js create mode 100644 ui/ui/summernote/lang/summernote-hu-HU.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-id-ID.js create mode 100644 ui/ui/summernote/lang/summernote-id-ID.min.js create mode 100644 ui/ui/summernote/lang/summernote-id-ID.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-it-IT.js create mode 100644 ui/ui/summernote/lang/summernote-it-IT.min.js create mode 100644 ui/ui/summernote/lang/summernote-it-IT.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-ja-JP.js create mode 100644 ui/ui/summernote/lang/summernote-ja-JP.min.js create mode 100644 ui/ui/summernote/lang/summernote-ja-JP.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-ko-KR.js create mode 100644 ui/ui/summernote/lang/summernote-ko-KR.min.js create mode 100644 ui/ui/summernote/lang/summernote-ko-KR.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-lt-LT.js create mode 100644 ui/ui/summernote/lang/summernote-lt-LT.min.js create mode 100644 ui/ui/summernote/lang/summernote-lt-LT.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-lt-LV.js create mode 100644 ui/ui/summernote/lang/summernote-lt-LV.min.js create mode 100644 ui/ui/summernote/lang/summernote-lt-LV.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-mn-MN.js create mode 100644 ui/ui/summernote/lang/summernote-mn-MN.min.js create mode 100644 ui/ui/summernote/lang/summernote-mn-MN.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-nb-NO.js create mode 100644 ui/ui/summernote/lang/summernote-nb-NO.min.js create mode 100644 ui/ui/summernote/lang/summernote-nb-NO.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-nl-NL.js create mode 100644 ui/ui/summernote/lang/summernote-nl-NL.min.js create mode 100644 ui/ui/summernote/lang/summernote-nl-NL.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-pl-PL.js create mode 100644 ui/ui/summernote/lang/summernote-pl-PL.min.js create mode 100644 ui/ui/summernote/lang/summernote-pl-PL.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-pt-BR.js create mode 100644 ui/ui/summernote/lang/summernote-pt-BR.min.js create mode 100644 ui/ui/summernote/lang/summernote-pt-BR.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-pt-PT.js create mode 100644 ui/ui/summernote/lang/summernote-pt-PT.min.js create mode 100644 ui/ui/summernote/lang/summernote-pt-PT.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-ro-RO.js create mode 100644 ui/ui/summernote/lang/summernote-ro-RO.min.js create mode 100644 ui/ui/summernote/lang/summernote-ro-RO.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-ru-RU.js create mode 100644 ui/ui/summernote/lang/summernote-ru-RU.min.js create mode 100644 ui/ui/summernote/lang/summernote-ru-RU.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-sk-SK.js create mode 100644 ui/ui/summernote/lang/summernote-sk-SK.min.js create mode 100644 ui/ui/summernote/lang/summernote-sk-SK.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-sl-SI.js create mode 100644 ui/ui/summernote/lang/summernote-sl-SI.min.js create mode 100644 ui/ui/summernote/lang/summernote-sl-SI.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-sr-RS-Latin.js create mode 100644 ui/ui/summernote/lang/summernote-sr-RS-Latin.min.js create mode 100644 ui/ui/summernote/lang/summernote-sr-RS-Latin.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-sr-RS.js create mode 100644 ui/ui/summernote/lang/summernote-sr-RS.min.js create mode 100644 ui/ui/summernote/lang/summernote-sr-RS.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-sv-SE.js create mode 100644 ui/ui/summernote/lang/summernote-sv-SE.min.js create mode 100644 ui/ui/summernote/lang/summernote-sv-SE.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-ta-IN.js create mode 100644 ui/ui/summernote/lang/summernote-ta-IN.min.js create mode 100644 ui/ui/summernote/lang/summernote-ta-IN.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-th-TH.js create mode 100644 ui/ui/summernote/lang/summernote-th-TH.min.js create mode 100644 ui/ui/summernote/lang/summernote-th-TH.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-tr-TR.js create mode 100644 ui/ui/summernote/lang/summernote-tr-TR.min.js create mode 100644 ui/ui/summernote/lang/summernote-tr-TR.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-uk-UA.js create mode 100644 ui/ui/summernote/lang/summernote-uk-UA.min.js create mode 100644 ui/ui/summernote/lang/summernote-uk-UA.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-uz-UZ.js create mode 100644 ui/ui/summernote/lang/summernote-uz-UZ.min.js create mode 100644 ui/ui/summernote/lang/summernote-uz-UZ.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-vi-VN.js create mode 100644 ui/ui/summernote/lang/summernote-vi-VN.min.js create mode 100644 ui/ui/summernote/lang/summernote-vi-VN.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-zh-CN.js create mode 100644 ui/ui/summernote/lang/summernote-zh-CN.min.js create mode 100644 ui/ui/summernote/lang/summernote-zh-CN.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/lang/summernote-zh-TW.js create mode 100644 ui/ui/summernote/lang/summernote-zh-TW.min.js create mode 100644 ui/ui/summernote/lang/summernote-zh-TW.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/summernote.min.css create mode 100644 ui/ui/summernote/summernote.min.js create mode 100644 ui/ui/summernote/summernote.min.js.LICENSE.txt create mode 100644 ui/ui/summernote/summernote.min.js.map diff --git a/system/autoload/Lang.php b/system/autoload/Lang.php index e037bf60..146b8aca 100644 --- a/system/autoload/Lang.php +++ b/system/autoload/Lang.php @@ -15,7 +15,7 @@ class Lang if (empty($lan_file)) { $lan_file = $root_path . File::pathFixer('system/lan/' . $config['language'] . '.json'); } - + if (is_array($_SESSION['Lang'])) { $_L = array_merge($_L, $_SESSION['Lang']); } diff --git a/ui/ui/page-edit.tpl b/ui/ui/page-edit.tpl index acbc7f39..d0ae1923 100644 --- a/ui/ui/page-edit.tpl +++ b/ui/ui/page-edit.tpl @@ -1,4 +1,6 @@ {include file="sections/header.tpl"} + +
    @@ -9,8 +11,7 @@
    {$pageHeader}
    -
    -
    {$htmls}
    + {if $writeable}
    SAVE @@ -38,24 +39,12 @@
    - -
    - {literal} {/literal} diff --git a/ui/ui/sections/footer.tpl b/ui/ui/sections/footer.tpl index 6974fbfa..413e9cec 100644 --- a/ui/ui/sections/footer.tpl +++ b/ui/ui/sections/footer.tpl @@ -12,6 +12,7 @@ + {if isset($xfooter)} diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl index cd337197..52c566fd 100644 --- a/ui/ui/sections/header.tpl +++ b/ui/ui/sections/header.tpl @@ -16,6 +16,7 @@ +