Browse Source

Merge pull request #245 from visuddhinanda/master

课程管理 拆开每个页面
visuddhinanda 5 years ago
parent
commit
7f73ecb1fc

File diff suppressed because it is too large
+ 2388 - 2388
app/admin/cs6_para.csv


+ 17 - 3
app/admin/db_update_cs6_para.php

@@ -2,6 +2,12 @@
 require_once "../public/_pdo.php";
 require_once "../path.php";
 
+	$db_file = _FILE_DB_PALITEXT_;
+	PDO_Connect("sqlite:$db_file");
+
+	$query = "select * from books where 1";
+	$books = PDO_FetchAll($query);
+
 
 	$db_file = _FILE_DB_PAGE_INDEX_;
 	PDO_Connect("sqlite:$db_file");
@@ -11,7 +17,7 @@ require_once "../path.php";
 	if(($fp=fopen("./cs6_para.csv", "r"))!==FALSE){
 		// 开始一个事务,关闭自动提交
 		$PDO->beginTransaction();
-		$query="INSERT INTO cs6_para ('book','para','book_name','cspara') VALUES (  ? , ? , ? , ? )";
+		$query="INSERT INTO cs6_para ('book','para','bookid','cspara','book_name') VALUES (  ? , ? , ? , ? , ? )";
 		$stmt = $PDO->prepare($query);
 
 		// 提交更改 
@@ -19,8 +25,16 @@ require_once "../path.php";
 			while(($data=fgetcsv($fp,0,','))!==FALSE){
 				$irow++;
 				if($irow>1){
+					$book_id=0;
+					foreach ($books as $key => $value) {
+						# code...
+						if($value["book"]==$data[0] && $data[1]>=$value["paragraph"]){
+							$book_id = $value["id"];
+							break;
+						}
+					}
 					if($data[3]==$data[4]){
-						$stmt->execute(array($data[0],$data[1],$data[2],$data[3]));
+						$stmt->execute(array($data[0],$data[1],$book_id,$data[3],$data[2]));
 					}
 					else{
 						$begin = (int)$data[3];
@@ -30,7 +44,7 @@ require_once "../path.php";
 							$arr1[] = $i;
 						}
 						foreach ($arr1 as $key => $value) {
-							$stmt->execute(array($data[0],$data[1],$data[2],$value));
+							$stmt->execute(array($data[0],$data[1],$book_id,$value,$data[2]));
 						}						
 					}
 

+ 41 - 3
app/course/my_course_edit.php

@@ -1,3 +1,32 @@
+<?php
+require_once '../studio/index_head.php';
+?>
+<body id="file_list_body" onLoad="course_list()">
+
+	<script language="javascript" src="../course/my_couse.js"></script>
+	<script language="javascript" src="../ucenter/name_selector.js"></script>
+	<script >
+	var gCurrPage="course";
+	</script>
+
+	<style>
+	#course {
+		background-color: var(--btn-border-color);
+		
+	}
+	#course:hover{
+		background-color: var(--btn-border-color);
+		color: var(--btn-color);
+		cursor:auto;
+	}
+	</style>
+
+	<?php
+	require_once '../studio/index_tool_bar.php';
+	?>
+		
+	<div class="index_inner" style="    margin-left: 18em;margin-top: 5em;">
+		<div id="course_list"  class="file_list_block">
 <style>
 .file_list_block{
     width:90%;
@@ -37,7 +66,7 @@ echo '</div>';
 echo '<div style="display:flex;">';
 
 echo '<div style="flex:8;padding:0 0.8em;">';
-echo '<form action="../course/my_course_index.php" onsubmit="return course_validate_form(this)"  method="POST">';
+echo '<form id="course_update" action="##"   method="POST">';
 echo '<input type="hidden" name="course" value="'.$course_info["id"].'" />';
 echo '<input type="hidden" name="op" value="update" />';
 echo '<div id="userfilelist">';
@@ -88,8 +117,9 @@ echo '<div id="userfilelist">';
 echo '</div>';
 ?>
 
-<input type="submit" value="<?php echo $_local->gui->submit ?>"/>
+
 </form>
+<button  onclick="course_update()"><?php echo $_local->gui->submit ?></button>
 </div>
 
 <div style="flex:2;border-left: 1px solid var(--tool-line-color);padding-left: 12px;">
@@ -118,4 +148,12 @@ echo '</div>';
 
 <script>
     name_selector_init("teacher_id",{input_id:"form_teacher"});
-</script>
+</script>
+
+</div>
+		
+        </div>
+        
+    <?php
+    require_once '../studio/index_foot.php';
+    ?>

+ 4 - 51
app/course/my_course_index.php

@@ -27,61 +27,14 @@ require_once '../studio/index_head.php';
 		
 	<div class="index_inner" style="    margin-left: 18em;margin-top: 5em;">
 		<div id="course_list"  class="file_list_block">
-
-    <?php
-    if(isset($_GET["lesson"]) || isset($_POST["lesson"])){
-		if(isset($_POST["op"]) && $_POST["op"]=="update"){
-			require_once("../course/my_lesson_update.php");
-		}
-		else{
-			require_once("../course/my_lesson_edit.php");
-		}
-		
-    }
-    else if(isset($_GET["course"]) || isset($_POST["course"]) ){
-		if(isset($_GET["course"])){
-			$_course_id = $_GET["course"];
-		}
-		else if(isset($_POST["course"])){
-			$_course_id = $_POST["course"];
-		}
-		if(isset($_GET["op"]) && $_GET["op"]=="newlesson"){
-			require_once("../course/my_lesson_new.php");
-		}
-		else if(isset($_POST["op"]) && $_POST["op"]=="insert"){
-			require_once("../course/my_lesson_insert.php");
-		}
-		else if(isset($_GET["op"]) && $_GET["op"]=="edit" ){
-			require_once("../course/my_course_edit.php");
-		}
-		else if(isset($_POST["op"]) && $_POST["op"]=="update" ){
-			require_once("../course/my_course_update.php");
-		}
-		else{
-			require_once("../course/my_lesson_list.php");
-		}
-		
-    }
-    else{
-		if(isset($_GET["op"]) && $_GET["op"]=="new"){
-			require_once("../course/my_course_new.php");
-		}
-		else if(isset($_POST["op"]) && $_POST["op"]=="insert"){
-			require_once("../course/my_course_insert.php");
-		}
-		else{
-			require_once '../course/my_course_list.php';
-		}
-        
-    }
-    
-    ?>
-			
+		<?php
+				require_once '../course/my_course_list.php';
+		?>
 		</div>
 		
 	</div>
 	
 <?php
-require_once '../studio/index_foot.php';
+	require_once '../studio/index_foot.php';
 ?>
 

+ 3 - 3
app/course/my_course_insert.php

@@ -16,12 +16,12 @@ if (!$sth || ($sth && $sth->errorCode() != 0)) {
 	$error = PDO_ErrorInfo();
 	$respond['status']=1;
 	$respond['message']=$error[2];
-	echo "<div style=''>Course 数据添加失败:{$error[2]}</div>";
+
 }
 else{
 	$respond['status']=0;
 	$respond['message']="成功";
-	echo "<div style=''>Course 数据添加成功</div>";
+
 }
-//echo json_encode($respond, JSON_UNESCAPED_UNICODE);
+echo json_encode($respond, JSON_UNESCAPED_UNICODE);
 ?>

+ 2 - 2
app/course/my_course_list.php

@@ -7,7 +7,7 @@
 		<span class="icon_btn_div">
 			<span class="icon_btn_tip"><?php echo $_local->gui->add;?></span>
 			<button id="file_add" type="button" class="icon_btn" title=" ">
-				<a href="../course/my_course_index.php?op=new">
+				<a href="../course/my_course_new.php">
 				<svg class="icon">
 					<use xlink:href="../studio/svg/icon.svg#ic_add_circle"></use>
 				</svg>
@@ -45,7 +45,7 @@ foreach($Fetch as $row){
     echo '<div class="file_list_row">';
 
     echo '<div class="pd-10" style="flex:8;padding:5px;">';
-    echo '<div class="title" style="padding-bottom:5px;"><a href="../course/my_course_index.php?course='.$row["id"].'">'.$row["title"].'</a></div>';
+    echo '<div class="title" style="padding-bottom:5px;"><a href="../course/my_lesson_list.php?course='.$row["id"].'">'.$row["title"].'</a></div>';
     echo '<div class="summary"  style="padding-bottom:5px;">'.$row["subtitle"].'</div>';
     echo '<div class="summary"  style="padding-bottom:5px;">'.$row["summary"].'</div>';
     echo '<div class="author"  style="padding-bottom:5px;">'.$_local->gui->speaker.':'.ucenter_getA($row["teacher"]).'</div>';

+ 73 - 3
app/course/my_course_new.php

@@ -1,3 +1,63 @@
+<?php
+require_once '../studio/index_head.php';
+?>
+<body id="file_list_body" onLoad="course_list()">
+
+	<script language="javascript" src="../course/my_couse.js"></script>
+	<script language="javascript" src="../ucenter/name_selector.js"></script>
+	<script >
+	var gCurrPage="course";
+	</script>
+
+	<style>
+	#course {
+		background-color: var(--btn-border-color);
+		
+	}
+	#course:hover{
+		background-color: var(--btn-border-color);
+		color: var(--btn-color);
+		cursor:auto;
+	}
+	</style>
+
+	<?php
+	require_once '../studio/index_tool_bar.php';
+	?>
+		
+	<div class="index_inner" style="    margin-left: 18em;margin-top: 5em;">
+		<div id="course_list"  class="file_list_block">
+
+<?php
+require_once '../studio/index_head.php';
+?>
+<body id="file_list_body" onLoad="course_list()">
+
+	<script language="javascript" src="../course/my_couse.js"></script>
+	<script language="javascript" src="../ucenter/name_selector.js"></script>
+	<script >
+	var gCurrPage="course";
+	</script>
+
+	<style>
+	#course {
+		background-color: var(--btn-border-color);
+		
+	}
+	#course:hover{
+		background-color: var(--btn-border-color);
+		color: var(--btn-color);
+		cursor:auto;
+	}
+	</style>
+
+	<?php
+	require_once '../studio/index_tool_bar.php';
+	?>
+		
+	<div class="index_inner" style="    margin-left: 18em;margin-top: 5em;">
+		<div id="course_list"  class="file_list_block">
+
 <div class="tool_bar">
 <?php
 require_once "../path.php";
@@ -13,7 +73,7 @@ echo '</div>';
 
 ?>
 
-<form action="../course/my_course_index.php" method="POST">
+<form id="course_insert" action="##" method="POST">
 <input type="hidden" name="op" value="insert" />
 
 <div id="userfilelist">
@@ -68,9 +128,19 @@ echo '</div>';
 </div>
 
 
-<input type="submit" value="<?php echo $_local->gui->create_course ?>" />
+
 </form>
+<button type="submit" onclick="course_insert()"><?php echo $_local->gui->create_course ?></button>
 
 <script>
     name_selector_init("teacher_id",{input_id:"form_teacher"});
-</script>
+</script>
+
+
+</div>
+		
+        </div>
+        
+    <?php
+    require_once '../studio/index_foot.php';
+    ?>

+ 1 - 3
app/course/my_course_update.php

@@ -15,12 +15,10 @@ if (!$sth || ($sth && $sth->errorCode() != 0)) {
 	$error = PDO_ErrorInfo();
 	$respond['status']=1;
 	$respond['message']=$error[2];
-	echo "<div style=''>Course 数据修改失败:{$error[2]}</div>";
 }
 else{
 	$respond['status']=0;
 	$respond['message']="成功";
-	echo "<div style=''>Course 数据修改成功</div>";
 }
-//echo json_encode($respond, JSON_UNESCAPED_UNICODE);
+echo json_encode($respond, JSON_UNESCAPED_UNICODE);
 ?>

+ 61 - 0
app/course/my_couse.js

@@ -132,3 +132,64 @@ function lesson_insert() {
 		},
 	});
 }
+
+function course_update() {
+	$.ajax({
+		type: "POST", //方法类型
+		dataType: "json", //预期服务器返回的数据类型
+		url: "../course/my_course_update.php", //url
+		data: $("#course_update").serialize(),
+		success: function (result) {
+			console.log(result); //打印服务端返回的数据(调试用)
+			alert(result.message);
+		},
+		error: function (data, status) {
+			alert(status + ":" + data.responseText);
+			switch (status) {
+				case "timeout":
+					break;
+				case "error":
+					break;
+				case "notmodified":
+					break;
+				case "parsererror":
+					break;
+				default:
+					break;
+			}
+		},
+	});
+}
+
+function course_insert() {
+	$.ajax({
+		type: "POST", //方法类型
+		dataType: "json", //预期服务器返回的数据类型
+		url: "../course/my_course_insert.php", //url
+		data: $("#course_insert").serialize(),
+		success: function (result) {
+			console.log(result); //打印服务端返回的数据(调试用)
+			if (result.status == 0) {
+				alert(result.message);
+				window.open("../course/my_course_index.php");
+			} else {
+				alert(result.message);
+			}
+		},
+		error: function (data, status) {
+			alert(status + ":" + data.responseText);
+			switch (status) {
+				case "timeout":
+					break;
+				case "error":
+					break;
+				case "notmodified":
+					break;
+				case "parsererror":
+					break;
+				default:
+					break;
+			}
+		},
+	});
+}

+ 48 - 4
app/course/my_lesson_edit.php

@@ -1,3 +1,33 @@
+<?php
+require_once '../studio/index_head.php';
+?>
+<body id="file_list_body" onLoad="course_list()">
+
+	<script language="javascript" src="../course/my_couse.js"></script>
+	<script language="javascript" src="../ucenter/name_selector.js"></script>
+	<script >
+	var gCurrPage="course";
+	</script>
+
+	<style>
+	#course {
+		background-color: var(--btn-border-color);
+		
+	}
+	#course:hover{
+		background-color: var(--btn-border-color);
+		color: var(--btn-color);
+		cursor:auto;
+	}
+	</style>
+
+	<?php
+	require_once '../studio/index_tool_bar.php';
+	?>
+		
+	<div class="index_inner" style="    margin-left: 18em;margin-top: 5em;">
+		<div id="course_list"  class="file_list_block">
+
 <script language="javascript" src="../media/img_dlg.js"></script>
 <style>
 .file_list_block{
@@ -97,9 +127,13 @@ echo '<div id="userfilelist">';
     $strDuration = date("H:i",$lesson_info["duration"]);
     echo '<input type="hidden" id="form_datetime" name="form_time" value="'.$lesson_info["date"].'"/>';
     echo '<input type="hidden" id="lesson_timezone" name="lesson_timezone" value=""/>';
-    echo $_local->gui->date.':<div id="form_date"></div>';
-    echo $_local->gui->time.':<div id="form_time"></div>';
-    echo $_local->gui->duration.':<input type="time" name="duration" value="'.$strDuration.'"/>';
+    
+    echo '<div style="display:flex;">';
+    echo "<div><div>".$_local->gui->date.'</div><div id="form_date"></div></div>';
+    echo "<div><div>".$_local->gui->time.'</div><div id="form_time"></div></div>';
+    echo "<div><div>".$_local->gui->duration.'</div><input type="time" name="duration" value="'.$strDuration.'"/></div>';
+    echo '</div>';
+    
     echo '</div>';
     echo '</div>';
 
@@ -152,4 +186,14 @@ echo '</div>';
     img_dlg_init("img_cover",{input_id:"cover_id"});
     time_init();
     
-</script>
+</script>
+
+
+</div>
+		
+        </div>
+        
+    <?php
+    require_once '../studio/index_foot.php';
+    ?>
+    

+ 43 - 3
app/course/my_lesson_list.php

@@ -1,3 +1,34 @@
+<?php
+require_once '../studio/index_head.php';
+?>
+<body id="file_list_body" onLoad="course_list()">
+
+	<script language="javascript" src="../course/my_couse.js"></script>
+	<script language="javascript" src="../ucenter/name_selector.js"></script>
+	<script >
+	var gCurrPage="course";
+	</script>
+
+	<style>
+	#course {
+		background-color: var(--btn-border-color);
+		
+	}
+	#course:hover{
+		background-color: var(--btn-border-color);
+		color: var(--btn-color);
+		cursor:auto;
+	}
+	</style>
+
+	<?php
+	require_once '../studio/index_tool_bar.php';
+	?>
+		
+	<div class="index_inner" style="    margin-left: 18em;margin-top: 5em;">
+		<div id="course_list"  class="file_list_block">
+
+
 <style>
 .file_list_block{
     width:95%;
@@ -70,7 +101,7 @@ echo '</div>';
     echo $_local->gui->speaker.':'.ucenter_getA($course_info["teacher"]);
     echo '</div></div>';
 ?>
-<div><a href="../course/my_course_index.php?course=<?php echo $course_info["id"];?>&op=edit">
+<div><a href="../course/my_course_edit.php?course=<?php echo $course_info["id"];?>">
 <svg viewBox="0 0 24 24" id="ic_mode_edit" height="24" width="24">
         <path fill="silver" d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04a.996.996 0 0 0 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"></path>
 </svg>
@@ -99,7 +130,7 @@ foreach($fAllLesson as $row){
     echo '<div style="flex:7;padding: 5px 15px;">';
 
     echo '<div class="pd-10">';
-    echo '<div  style="padding-bottom:5px;font-size: 120%;"><a href="../course/my_course_index.php?lesson='.$row["id"].'">'.$row["title"].'</a></div>';
+    echo '<div  style="padding-bottom:5px;font-size: 120%;"><a href="../course/my_lesson_edit.php?lesson='.$row["id"].'">'.$row["title"].'</a></div>';
     echo '<div class="summary"  style="padding-bottom:5px;">'.$row["subtitle"].'</div>';
     echo '<div class="summary"  style="padding-margin:5px; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;
     overflow: hidden;">'.$row["summary"].'</div>';
@@ -137,4 +168,13 @@ echo '</div>';
 
     </div>
 
-</div>
+</div>
+
+
+</div>
+		
+        </div>
+        
+    <?php
+    require_once '../studio/index_foot.php';
+    ?>

+ 1 - 1
app/path.php

@@ -8,7 +8,7 @@ define("_DIR_PALICANON_PALITEXT_" , __DIR__."/../tmp/appdata/palicanon/pali_text
 define("_DIR_PALICANON_WBW_" , __DIR__."/../tmp/appdata/palicanon/wbw");
 define("_DIR_PALICANON_TRAN_" , __DIR__."/../tmp/appdata/palicanon/translate");
 
-//pali canon db file
+//pali canon db file 语料库
 define("_FILE_DB_RESRES_INDEX_"  , __DIR__."/../tmp/appdata/palicanon/res.db3");
 define("_FILE_DB_PALITEXT_" , __DIR__."/../tmp/appdata/palicanon/pali_text.db3");
 define("_FILE_DB_STATISTICS_" , __DIR__."/../tmp/appdata/palicanon/word_statistics.db3");

+ 1 - 0
app/pcdl/html_head.php

@@ -66,6 +66,7 @@ else{
 	<script src="../usent/historay.js"></script>
 	<script src="../term/pali_sim_sent.js"></script>
 	<link type="text/css" rel="stylesheet" href="../term/pali_sim_dlg.css"/>
+	<script src="../term/related_para.js"></script>
 
 
 	<script src="../widget/click_dropdown.js"></script>

+ 13 - 3
app/reader/get_para.php

@@ -4,8 +4,19 @@ require_once "../path.php";
 
 define("_MAX_CHAPTER_LEN_" , 20000);
 
-$_book = $_GET["book"];
-$_para = $_GET["para"];
+if(isset($_GET["book"])){
+    $_book = $_GET["book"];
+}
+else{
+    exit;
+}
+if(isset($_GET["para"])){
+    $_para = $_GET["para"];
+}
+else{
+    exit;
+}
+
 if(isset($_GET["begin"])){
     $_begin = $_GET["begin"];
 }
@@ -25,7 +36,6 @@ if($_view=="sent"){
 }
 
 
-
 PDO_Connect("sqlite:"._FILE_DB_PALITEXT_);
 $query = "SELECT * FROM 'pali_text'  WHERE book= ? AND paragraph= ?";
 $FetchParInfo = PDO_FetchRow($query , array($_book,$_para));

+ 2 - 0
app/term/note.js

@@ -37,6 +37,7 @@ function note_create() {
 	note_sent_edit_dlg_init();
 	term_edit_dlg_init();
 	pali_sim_dlg_init();
+	related_para_dlg_init();
 }
 function note_sent_edit_dlg_init() {
 	$("body").append(
@@ -431,6 +432,7 @@ function note_json_html(in_json) {
 	if (typeof _reader_view != "undefined" && _reader_view != "sent") {
 		output += "<a onclick='junp_to(this)'>跳转至此句</a>";
 	}
+	output += "<a  onclick='related_para_dlg_open(" + in_json.book + "," + in_json.para + ")'>相关段落</a>";
 	output += "<a  onclick='goto_nissaya(" + in_json.book + "," + in_json.para + ")'>Nissaya</a>";
 	output +=
 		"<a onclick=\"copy_ref('" +

+ 62 - 0
app/term/related_para.js

@@ -0,0 +1,62 @@
+function related_para_dlg_init(title = "Related") {
+	$("body").append(
+		'<div id="related_para_dlg" title="' + title + '"><div id="related_para_dlg_content"></div></div>'
+	);
+
+	$("#related_para_dlg").dialog({
+		autoOpen: false,
+		width: 550,
+		buttons: [
+			{
+				text: "Close",
+				click: function () {
+					$(this).dialog("close");
+				},
+			},
+		],
+	});
+}
+function related_para_dlg_open(book, para) {
+	$.get(
+		"../term/related_para.php",
+		{
+			book: book,
+			para: para,
+		},
+		function (data) {
+			let para = JSON.parse(data);
+			let html = related_para_dlg_render(para);
+			$("#related_para_dlg_content").html(html);
+			$("#related_para_dlg").dialog("open");
+		}
+	);
+}
+
+function related_para_dlg_render(para) {
+	let output = "";
+	for (const iterator of para.book_list) {
+		output += "<div>";
+		if (para.curr_book_id == iterator.id) {
+			output += "<b>" + iterator.title + "</b>";
+		} else {
+			//找到与这个书匹配的段落
+			let paraList = new Array();
+			for (const ipara of para.data) {
+				if (ipara.bookid == iterator.id) {
+					paraList.push(ipara);
+				}
+			}
+			output +=
+				"<a href='../reader/?view=para&book=" +
+				paraList[0].book +
+				"&para=" +
+				paraList[0].para +
+				"' target='_blank'>" +
+				iterator.title +
+				"</a>";
+		}
+		output += "</div>";
+	}
+
+	return output;
+}

+ 25 - 7
app/term/related_para.php

@@ -27,20 +27,38 @@ else{
 }
 
 	PDO_Connect("sqlite:"._FILE_DB_PAGE_INDEX_);
-	$query="select bookid,cspara ,book_name from cs6_para where book = ? and para=?";
+	$query="SELECT bookid,cspara ,book_name FROM cs6_para where book = ? and para= ? ";
 	$fetch = PDO_FetchAll($query,array($book,$para));
 	if(count($fetch)>0){
+		$aBookid=array();
 		$place_holders = implode(',', array_fill(0, count($fetch), '?'));
-		$query="SELECT book, para from cs6_para where bookid = ? and cspara in  ($place_holders) and book_name <> ?  ";
-		$param[] = $fetch[0]["bookid"];
+		$query="SELECT book, para,bookid from cs6_para where book_name = ? and cspara in  ($place_holders)  ";
+		$param[] = $fetch[0]["book_name"];
 
 		foreach ($fetch as $key => $value) {
 			$param[] =$value["cspara"];
 		}
-		$param[] = $fetch[0]["book_name"];
-		$fetch = PDO_FetchAll($query,$param);
-		$result["data"]=$fetch;
+		$fetchAllPara = PDO_FetchAll($query,$param);
+		foreach ($fetchAllPara as  $bookid) {
+			$aBookid["{$bookid["bookid"]}"] = 1;
+		}
+		$result["data"]=$fetchAllPara;
+		$result["curr_book_id"]=$fetch[0]["bookid"];
+
+		//获取书名 列表
+		$book_list= array();
+		$db_file = _FILE_DB_PALITEXT_;
+		PDO_Connect("sqlite:$db_file");
+		
+		foreach ($aBookid as $bookkey => $bookvalue ) {
+			# code...
+			$query = "select * from books where id=".$bookkey;
+			$book_list[] = PDO_FetchRow($query);
+		}
+		$result["book_list"]=$book_list;
+
 	}
-echo json_encode($result, JSON_UNESCAPED_UNICODE);
+
+	echo json_encode($result, JSON_UNESCAPED_UNICODE);
 
 ?>

Some files were not shown because too many files changed in this diff