fixed localization for unicode characters, accept utf-8 charset data in forms

Author: akhileshdarjee

app/Http/Controllers/CommonController.php

@@ -245,7 +245,7 @@ public function updateLocale($locale)
 
             if ($locale != 'en' && File::exists(resource_path('lang/' . $locale . '.json'))) {
                 $translations = File::get(resource_path('lang/' . $locale . '.json'));
-                $translations = json_decode($translations, true);
+                $translations = json_decode($translations, false, 512, JSON_UNESCAPED_UNICODE);
             }
 
             session()->put('translations', $translations);

app/Http/Controllers/Reports/UserReport.php

@@ -3,17 +3,15 @@
 namespace App\Http\Controllers\Reports;
 
 use DB;
+use App\User;
 use App\Http\Controllers\Controller;
 
 class UserReport extends Controller
 {
     // get all rows & colummns for report
     public function getData($request, $per_page, $download)
     {
-        $user_table_name = cache('app_modules')['User']['table_name'];
-
-        $query = DB::table($user_table_name)
-            ->select(
+        $rows = User::select(
                 'id', 'full_name', 'username', 'email', 'role', 
                 DB::raw("if(active, 'Yes', 'No') as active")
             );
@@ -22,34 +20,34 @@ public function getData($request, $per_page, $download)
             $filters = $request->get('filters');
 
             if (isset($filters['full_name']) && $filters['full_name']) {
-                $query = $query->where('full_name', $filters['full_name']);
+                $rows = $rows->where('full_name', $filters['full_name']);
             }
             if (isset($filters['username']) && $filters['username']) {
-                $query = $query->where('username', $filters['username']);
+                $rows = $rows->where('username', $filters['username']);
             }
             if (isset($filters['email']) && $filters['email']) {
-                $query = $query->where('email', $filters['email']);
+                $rows = $rows->where('email', $filters['email']);
             }
             if (isset($filters['role']) && $filters['role']) {
-                $query = $query->where('role', $filters['role']);
+                $rows = $rows->where('role', $filters['role']);
             }
             if (isset($filters['active'])) {
-                $query = $query->where('active', intval($filters['active']));
+                $rows = $rows->where('active', intval($filters['active']));
             }
             if (isset($filters['from_date']) && isset($filters['to_date']) && $filters['from_date'] && $filters['to_date']) {
-                $query = $query->where('created_at', '>=', date('Y-m-d H:i:s', strtotime($filters['from_date'])))
+                $rows = $rows->where('created_at', '>=', date('Y-m-d H:i:s', strtotime($filters['from_date'])))
                     ->where('created_at', '<=', date('Y-m-d H:i:s', strtotime($filters['to_date'])));
             }
         }
 
         if (!in_array(auth()->user()->role, ["System Administrator", "Administrator"])) {
-            $query = $query->where('username', auth()->user()->username);
+            $rows = $rows->where('username', auth()->user()->username);
         }
 
         if ($download) {
-            $rows = $query->orderBy('id', 'desc')->get();
+            $rows = $rows->orderBy('id', 'desc')->get();
         } else {
-            $rows = $query->orderBy('id', 'desc')->paginate($per_page);
+            $rows = $rows->orderBy('id', 'desc')->paginate($per_page);
         }
 
         return array(

app/Http/Middleware/Localization.php

@@ -30,7 +30,7 @@ public function handle($request, Closure $next)
 
             if ($locale != 'en' && File::exists(resource_path('lang/' . $locale . '.json'))) {
                 $translations = File::get(resource_path('lang/' . $locale . '.json'));
-                $translations = json_decode($translations, true);
+                $translations = json_decode($translations, false, 512, JSON_UNESCAPED_UNICODE);
             }
 
             session()->put('translations', $translations);

public/css/all.css

@@ -1,5 +1,5 @@
 {
-    "/css/all.css": "/css/all.css?id=931eb8ab8688a198ad15",
+    "/css/all.css": "/css/all.css?id=35b7ae0f6416938dd898",
     "/js/all.js": "/js/all.js?id=d9d3d94d21ae993ebc18",
     "/js/origin/activity.js": "/js/origin/activity.js?id=bcc8da49d4ddb1e273d6",
     "/js/origin/backups.js": "/js/origin/backups.js?id=1a6e72395cc52b9c6f46",

public/mix-manifest.json

@@ -216,7 +216,7 @@ a.back-to-top:hover {
 	cursor: pointer;
 	background-color: #fff;
 	color: rgba(0,0,0,.9);
-	font-family: 'Roboto',sans-serif,'Helvetica Neue',Helvetica,Arial;
+	font-family: 'Roboto',arial,sans-serif;
 	font-size: .9rem;
 }
 .ui-menu .ui-menu-item:last-child, .ui-menu .ui-menu-item:last-child:hover {
@@ -342,7 +342,7 @@ a.back-to-top:hover {
 .breadcrumb.app-breadcrumb > li+li:before {
 	padding: 0 5px;
 	content: "\f105";
-	font-family: FontAwesome;
+	font-family: 'Font Awesome 5 Free';
 	color: #fff;
 }
 .title-section {

resources/css/adminlte.min.css

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ app()->getLocale() }}">
     <head>
         <title>@yield('title')</title>
         @stack('meta')

resources/css/origin/origin.css

@@ -1,4 +1,4 @@
-<form method="POST" action="{{ route('save.app.settings') }}" name="settings" id="settings" enctype="multipart/form-data">
+<form method="POST" action="{{ route('save.app.settings') }}" name="settings" id="settings" enctype="multipart/form-data" accept-charset="utf-8">
     {!! csrf_field() !!}
     <div class="card form-section elevation-2" id="setting-details">
         <div class="card-body form-content pt-3">

resources/views/admin.blade.php

@@ -136,7 +136,7 @@
                         @else
                             @var $action = route('new.doc', $slug)
                         @endif
-                        <form method="POST" action="{{ $action }}" name="{{ $slug }}" id="{{ $slug }}" enctype="multipart/form-data">
+                        <form method="POST" action="{{ $action }}" name="{{ $slug }}" id="{{ $slug }}" enctype="multipart/form-data" accept-charset="utf-8">
                             {!! csrf_field() !!}
                             <input type="hidden" name="id" id="id" class="form-control" data-mandatory="no" autocomplete="off" readonly>
                             @if (view()->exists(str_replace('.', '/', $file)))

resources/views/admin/layouts/origin/settings.blade.php

@@ -1,4 +1,8 @@
-<meta charset="utf-8">
+<meta charset="UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Language" content="{{ app()->getLocale() }}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="referrer" content="origin">
 <meta name="description" content="{{ config('app.brand.name') }}">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
 <meta name="csrf-token" content="{{ csrf_token() }}">