:bug: 添加协作人，不能显示人名

app/doc/coop.js

@@ -1,103 +1,103 @@
-function username_search_keyup(e,obj){
-        var keynum
-        var keychar
-        var numcheck
+function username_search_keyup(e, obj) {
+    var keynum
+    var keychar
+    var numcheck
 
-        if($("#wiki_search_input").val()==""){
-            $("#search_result").html("");
-            return;
-        }
-        
-        if(window.event) // IE
-        {
+    if ($("#wiki_search_input").val() == "") {
+        $("#search_result").html("");
+        return;
+    }
+
+    if (window.event) // IE
+    {
         keynum = e.keyCode
-        }
-        else if(e.which) // Netscape/Firefox/Opera
-        {
+    }
+    else if (e.which) // Netscape/Firefox/Opera
+    {
         keynum = e.which
-        }
-        var keychar = String.fromCharCode(keynum)
-        if(keynum==13){
-            //dict_search(obj.value);
-        }
-        else{
-            username_search(obj.value);
-        }
     }
+    var keychar = String.fromCharCode(keynum)
+    if (keynum == 13) {
+        //dict_search(obj.value);
+    }
+    else {
+        username_search(obj.value);
+    }
+}
 
-    function username_search(keyword){
-        $.get("../ucenter/get.php",
+function username_search(keyword) {
+    $.get("../ucenter/get.php",
         {
-            username:keyword
+            username: keyword
         },
-        function(data,status){
-            let result= JSON.parse(data);
-            let html="<ul id='user_search_list'>";
-            if(result.length>0){
-                for(x in result){
-                    html += "<li><a onclick=\"coop_add('"+result[x].userid+"')\">"+result[x].username+"["+result[x].email+"]</a></li>";
+        function (data, status) {
+            let result = JSON.parse(data);
+            let html = "<ul id='user_search_list'>";
+            if (result.length > 0) {
+                for (x in result) {
+                    html += "<li><a onclick=\"coop_add('" + result[x].id + "')\">" + result[x].username + "[" + result[x].email + "]</a></li>";
                 }
             }
             html += "</ul>";
             $("#search_result").html(html);
         });
-    }
+}
 
-    var coop_show_div_id="";
-    var coop_doc_id="";
-    function coop_init(doc_id,strDivId){
-        coop_show_div_id = strDivId;
-        coop_doc_id = doc_id
-    }
+var coop_show_div_id = "";
+var coop_doc_id = "";
+function coop_init(doc_id, strDivId) {
+    coop_show_div_id = strDivId;
+    coop_doc_id = doc_id
+}
 
-    function coop_list(){
-        $.get("../doc/coop.php",
+function coop_list() {
+    $.get("../doc/coop.php",
         {
-            do:"list",
-            doc_id:coop_doc_id
+            do: "list",
+            doc_id: coop_doc_id
         },
-        function(data,status){
-            $("#"+coop_show_div_id).html(data);
-        });   
+        function (data, status) {
+            $("#" + coop_show_div_id).html(data);
+        });
 
-    }
+}
 
-    function coop_add(userid){
-        $.get("../doc/coop.php",
+function coop_add(userid) {
+    $.get("../doc/coop.php",
         {
-            do:"add",
-            doc_id:coop_doc_id,
-            user_id:userid
+            do: "add",
+            doc_id: coop_doc_id,
+            user_id: userid
         },
-        function(data,status){
-            $("#"+coop_show_div_id).html(data);
-        });       
-    }
+        function (data, status) {
+            $("#" + coop_show_div_id).html(data);
+        });
+}
 
-    function coop_del(userid){
-        $.get("../doc/coop.php",
+function coop_del(userid) {
+    $.get("../doc/coop.php",
         {
-            do:"del",
-            doc_id:coop_doc_id,
-            user_id:userid
+            do: "del",
+            doc_id: coop_doc_id,
+            user_id: userid
         },
-        function(data,status){
-            $("#"+coop_show_div_id).html(data);
-        });           
-    }
-    function coop_set(userid ,value){
-        $.get("../doc/coop.php",
+        function (data, status) {
+            $("#" + coop_show_div_id).html(data);
+        });
+}
+function coop_set(userid, value) {
+    $.get("../doc/coop.php",
         {
-            do:"set",
-            doc_id:coop_doc_id,
-            user_id:userid,
-            value:value
+            do: "set",
+            doc_id: coop_doc_id,
+            user_id: userid,
+            value: value
         },
-        function(data,status){
-            $("#"+coop_show_div_id).html(data);
-        });     
-    }
+        function (data, status) {
+            $("#" + coop_show_div_id).html(data);
+        });
+}
 
-    function coop_power_change(userid,obj){
-        coop_set(userid ,obj.value)
-    }
+function coop_power_change(userid, obj) {
+    coop_set(userid, obj.value)
+}

app/studio/group.php

@@ -1,141 +1,34 @@
 <?php
-require_once 'checklogin.inc';
-require_once '../public/config.php';
-require_once '../public/load_lang.php';
-require_once "../public/_pdo.php";
-
-//load language file
-if(file_exists($dir_language.$currLanguage.".php")){
-	require $dir_language.$currLanguage.".php";
-}
-else{
-	include $dir_language."default.php";
-}
-
-
-
-if(isset($_GET["device"])){
-	$currDevice=$_GET["device"];
-}
-else{
-	if(isset($_COOKIE["device"])){
-		$currDevice=$_COOKIE["device"];
-	}
-	else{
-		$currDevice="computer";
-	}
-}
-
+require_once '../studio/index_head.php';
+require_once '../public/_pdo.php';
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link type="text/css" rel="stylesheet" href="css/style.css"/>
-	<link type="text/css" rel="stylesheet" href="css/color_day.css" id="colorchange" />
-	<title><?php echo $_local->gui->pcd_studio; ?></title>
-	<script language="javascript" src="js/common.js"></script>
-	<script language="javascript" src="js/filenew.js"></script>
-	<script language="javascript" src="js/index_mydoc.js"></script>
-	<script src="js/jquery-3.3.1.min.js"></script>
-	<script src="../public/js/jquery.js"></script>
-	<script src="js/fixedsticky.js"></script>
-	<script type="text/javascript">
-	<?php require_once '../public/load_lang_js.php';//加载js语言包?>
-		
-		var g_device = "computer";
-		var strSertch = location.search;
-		if(strSertch.length>0){
-			strSertch = strSertch.substr(1);
-			var sertchList=strSertch.split('&');
-			for ( i in sertchList){
-				var item = sertchList[i].split('=');
-				if(item[0]=="device"){
-					g_device=item[1];
-				}
-			}
-		}
-		if(g_device=="mobile"){
-			g_is_mobile=true;
-		}
-		else{
-			g_is_mobile=false;
-		}
-
-		var g_langrage="en";
-		function menuLangrage(obj){
-			g_langrage=obj.value;
-			setCookie('language',g_langrage,365);
-			window.location.assign("index.php?language="+g_langrage);
-		}
 
-	</script>
-
-</head>
 <body class="indexbody" >
+<script >
+	var gCurrPage="group_index";
+</script>
 
+<style>
+	#group_index {
+		background-color: var(--btn-border-color);
+		
+	}
+	#group_index:hover{
+		background-color: var(--btn-border-color);
+		color: var(--btn-color);
+		cursor:auto;
+	}
+	</style>
 		<!-- tool bar begin-->
-		<div class='index_toolbar'>
-			<div id="index_nav">
-				<button><?php echo $_local->gui->recent_scan;?></button>
-				<button><a href="index_pc.php?language=<?php echo $currLanguage; ?>"><?php echo $_local->gui->pali_canon;?></a></button>
-				<button class="selected" ><a href="group.php?language=<?php echo $currLanguage; ?>">Group</a></button>
-				<button><a href="filenew.php?language=<?php echo $currLanguage; ?>"><?php echo $_local->gui->new_project;?></a></button>
-				<button><a href="index_tools.php?language=<?php echo $currLanguage; ?>"><?php echo $_local->gui->tools;?></a></button>
-			</div>
-			<div>
-			
-			</div>
-			<div class="toolgroup1">
-				<span><?php echo $_local->gui->language;?></span>
-				<select id="id_language" name="menu" onchange="menuLangrage(this)">
-					<option value="en" >English</option>
-					<option value="si" >සිංහල</option>
-					<option value="my" >myanmar</option>
-					<option value="zh-cn" >简体中文</option>
-					<option value="zh-tw" >繁體中文</option>
-				</select>
-			
-			<?php 
-			
-				echo $_local->gui->welcome;
-				echo "<a href=\"setting.php?item=account\">";
-				echo urldecode($_COOKIE["nickname"]);
-				echo "</a>";
-				echo $_local->gui->to_the_dhamma;
-				echo "<a href='login.php?op=logout'>";
-				echo $_local->gui->logout;
-				echo "</a>";;
-			?>
-				<button class="icon_btn" id="file_select" >
-					<a href="setting.php" target='_blank'>
-					<svg class="icon">
-						<use xlink:href="svg/icon.svg#ic_settings"></use>
-					</svg>
-					</a>
-				</button>			
-			</div>
-		</div>	
+		<?php
+		require_once '../studio/index_tool_bar.php';
+		?>
 		<!--tool bar end -->
 		<script>
 			document.getElementById("id_language").value="<?php echo($currLanguage); ?>";
 		</script>
 	<div class="index_inner">
-		<div id="id_app_name"><?php echo $module_gui_str['editor']['1051'];?>
-			<span style="font-size: 70%;">1.6</span><br />
-			<?php if($currLanguage=="en"){ ?>
-				<span style="font-size: 70%;">Pali Cannon Database Studio</span>
-			<?php 
-			}
-			else{
-			?>
-				<span style="font-size: 70%;">PCD Studio</span>
-			<?php
-			}
-			?>
-		</div>
-				
+			
 		<div class="fun_block">
 			<div id="userfilelist">
 			<?php
@@ -146,7 +39,7 @@ else{
 				$list="group";
 			}
 
-			PDO_Connect("sqlite:"._FILE_DB_FILEINDEX_);
+			PDO_Connect("sqlite:"._FILE_DB_GROUP_);
 			switch($list){
 				case "group":
 					echo "<div class='group_path'>Group</div>";

app/studio/index_head.php

@@ -1,4 +1,5 @@
 <?php
+require_once '../path.php';
 require_once '../ucenter/login.php';
 require_once '../public/config.php';
 require_once '../public/load_lang.php';

app/studio/index_pc.php

@@ -3,6 +3,22 @@ require_once '../studio/index_head.php';
 ?>
 
 <body class="indexbody" onload="wizard_palicannon_init()">
+<script >
+	var gCurrPage="pali_canon";
+</script>
+
+<style>
+	#pali_canon {
+		background-color: var(--btn-border-color);
+		
+	}
+	#pali_canon:hover{
+		background-color: var(--btn-border-color);
+		color: var(--btn-color);
+		cursor:auto;
+	}
+	</style>
+
 	<script language="javascript" src="module/editor_palicannon/palicannon.js"></script>
 	<script language="javascript" src="module/editor_palicannon/language/<?php echo $currLanguage; ?>.js"></script>
 

app/studio/index_recent.php

@@ -1,80 +1,9 @@
 <?php
-require_once '../ucenter/login.php';
-require_once '../public/config.php';
-require_once '../public/load_lang.php';
-
-
-//load language file
-if(file_exists($dir_language.$currLanguage.".php")){
-	require $dir_language.$currLanguage.".php";
-}
-else{
-	include $dir_language."default.php";
-}
-
-
-
-if(isset($_GET["device"])){
-	$currDevice=$_GET["device"];
-}
-else{
-	if(isset($_COOKIE["device"])){
-		$currDevice=$_COOKIE["device"];
-	}
-	else{
-		$currDevice="computer";
-	}
-}
-
+require_once '../studio/index_head.php';
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link type="text/css" rel="stylesheet" href="css/style.css"/>
-	<link type="text/css" rel="stylesheet" href="css/color_day.css" id="colorchange" />
-	<title><?php echo $_local->gui->pcd_studio; ?></title>
-	<script language="javascript" src="js/common.js"></script>
-	<script language="javascript" src="js/index_mydoc.js"></script>
-	<script src="js/jquery-3.3.1.min.js"></script>
-	<script src="../public/js/jquery.js"></script>
-	<script src="js/fixedsticky.js"></script>
-	<script src="../doc/coop.js"></script>
-	<script src="../public/js/notify.js"></script>
-	<script src="../public/js/comm.js"></script>
-	<link type="text/css" rel="stylesheet" href="../public/css/notify.css"/>
-
-	<script type="text/javascript">
-	<?php require_once '../public/load_lang_js.php';//加载js语言包?>
-		
-		var g_device = "computer";
-		var strSertch = location.search;
-		if(strSertch.length>0){
-			strSertch = strSertch.substr(1);
-			var sertchList=strSertch.split('&');
-			for ( i in sertchList){
-				var item = sertchList[i].split('=');
-				if(item[0]=="device"){
-					g_device=item[1];
-				}
-			}
-		}
-		if(g_device=="mobile"){
-			g_is_mobile=true;
-		}
-		else{
-			g_is_mobile=false;
-		}
-
-		var g_langrage="en";
-		function menuLangrage(obj){
-			g_langrage=obj.value;
-			setCookie('language',g_langrage,365);
-			window.location.assign("index.php?language="+g_langrage);
-		}
-	
-	var gCurrPage="recent_scan";
+<body id="file_list_body" onLoad="indexInit()">
+	<script>
+		var gCurrPage="recent_scan";
 	</script>
 	<style>
 	#recent_scan {
@@ -87,8 +16,8 @@ else{
 		cursor:auto;
 	}
 	</style>
-</head>
-<body id="file_list_body" onLoad="indexInit()">
+	<script language="javascript" src="js/index_mydoc.js"></script>
+	<script src="../doc/coop.js"></script>
 
 	<?php
 	require_once 'index_tool_bar.php';