Merge branch 'master' of https://github.com/visuddhinanda/mint

app/doc/fork.php

@@ -13,6 +13,7 @@
     }
     else{
         echo "尚未登录";
+        echo "<h3><a href='../ucenter/index.php?op=login'>登录</a>后才可以打开文档 </h3>";
         exit;
     }
     PDO_Connect("sqlite:"._FILE_DB_FILEINDEX_);
@@ -44,12 +45,15 @@
                 if($iFetchSelf>0){
                     //以前打开过
                     echo "文档已经复刻";
-                    echo "<a href='../studio/editor.php?op=opendb&doc_id={$doc_id}'>在编辑器中打开</a>";
+                    echo "正在<a href='../studio/editor.php?op=opendb&doc_id={$doc_id}'>打开</a>文档";
+                    echo "<script>";
+                    echo "window.location.assign(\"../studio/editor.php?op=opendb&doc_id={$doc_id}\");";
+                    echo "</script>";
                 }
                 else{
                     //以前没打开过
-                    echo "共享的文档，fork并打开...";
-
+                    echo "<h3>共享的文档，正在fork...</h3>";
+                    echo "<div style='display:none;'>";
                     //获取文件路径
                     
                     PDO_Connect("sqlite:"._FILE_DB_USERINFO_);
@@ -339,8 +343,13 @@
                             //文档列表插入成功
                             
                             echo "doc list updata 1 recorders.";
-                            echo "<a href='../studio/editor.php?op=opendb&doc_id={$newDocId}'>在编辑器中打开</a>";
-                        }                        
+                            echo "</div>";
+                            echo "<h3>复刻成功</h3>";
+                            echo "正在<a href='../studio/editor.php?op=opendb&doc_id={$newDocId}'>打开</a>文档";
+                            echo "<script>";
+                            echo "window.location.assign(\"../studio/editor.php?op=opendb&fileid={$newDocId}\");";
+                            echo "</script>";
+                        } 
                     }
                     else{
                         echo "无效的文档id";

app/studio/js/message.js

@@ -198,7 +198,8 @@ function msg_read(msg_obj, status = null) {
 function msg_apply_data(obj) {
 	if (obj.sender == getCookie("username")) {
 		//忽略自己的消息
-		return;
+		msg_read(obj, 1);//设置为已读
+		return (true);
 	}
 	doc_info.sendmsg = false;//不发送消息
 	try {
@@ -650,10 +651,23 @@ function word_msg_counter_click(wordId) {
 function msg_show_msg_content(type, id) {
 	msg_show_content(type, id);
 	msg_show_content_panal();
-	//tab_click('msg_panal_right', 'rb_msg');
 	tab_click_b('sys_message', 'tab_rb_sys_message', editor_show_right_tool_bar, true);
 }
 
+function show_tran_net(book, para, begin, end) {
+	tab_click_b('sys_message', 'tab_rb_sys_message', editor_show_right_tool_bar, true);
+	$.get("../usent/get.php",
+		{
+			book: book,
+			para: para,
+			begin: begin,
+			end: end
+		},
+		function (data, status) {
+			$("#msg_panal_content").html(data);
+		});
+}
+
 function msg_show_list_panal() {
 	$("#msg_panal_content_toolbar").hide();
 	$("#msg_panal_content").hide();

app/studio/project.php

@@ -17,7 +17,7 @@ require_once "../public/_pdo.php";
 require_once "../public/function.php";
 require_once "../public/load_lang.php";
 require_once "./book_list_en.inc";
-require_once "../path.php";
+require_once "../ucenter/function.php";
 
 $sLang["1"]="pali";
 $sLang["2"]="en";
@@ -777,7 +777,7 @@ switch($op){
 			$uid=$_COOKIE["uid"];
 		}
 		else{
-			echo "尚未登录";
+			echo "<h3><a href='../ucenter/index.php?op=login'>登录</a>后才可以打开文档 </h3>";
 			exit;
 		}
 		$db_file = _FILE_DB_FILEINDEX_;
@@ -799,9 +799,12 @@ switch($op){
 				
 				if($owner==$uid){
 					//自己的文档
-					echo "自己的文档";
+					echo "<h3>我的文档</h3>";
 					$my_doc_id=$doc_id;
-					//echo "<a href=\"editor.php?op=open&fileid={$doc_id}\">打开</a>";
+					echo "正在<a href=\"editor.php?op=opendb&fileid={$doc_id}\">打开</a>文档";
+					echo "<script>";
+					echo "window.location.assign(\"editor.php?op=opendb&fileid={$doc_id}\");";
+					echo "</script>";
 				}
 				else{
 					//别人的文档
@@ -811,9 +814,12 @@ switch($op){
 					$iFetchSelf=count($FetchSelf);
 					if($iFetchSelf>0){
 						//以前打开过
-						echo "共享的文档 以前打开过";
+						echo "已经复制的文档 Already Copy";
 						$my_doc_id=$FetchSelf[0]["id"];
-						echo "<a href='../studio/editor.php?op=opendb&doc_id={$doc_id}'>在编辑器中打开</a>";
+						echo "<a href='../studio/editor.php?op=opendb&fileid={$doc_id}'>Open in Studio</a>";
+						echo "<script>";
+						echo "window.location.assign(\"editor.php?op=opendb&fileid={$doc_id}\");";
+						echo "</script>";						
 					}
 					else{
 						//以前没打开过
@@ -829,21 +835,21 @@ switch($op){
 						<ul>
 						<?php
 						$book_name=$book["p".$mbook];
-						echo "<li>文档主人：{$owner}</li>";
-						echo "<li>文档标题：{$title}</li>";
-						echo "<li>书名：{$book_name}</li>";
+						echo "<li>Owner：".ucenter_get($owner)."</li>";
+						echo "<li>Title：{$title}</li>";
+						echo "<li>Book：{$book_name}</li>";
 						?>
 						</ul>
 						</div>
 						<p><?php echo $_local->gui->open_with?>：</p>
 						<ul>
-						<li><a href="../pcdl/reader.php?file=<?php echo $doc_id;?>"><?php echo $_local->gui->reader;?>（<?php echo $_local->gui->read_only;?>）</a></li>
+						<li style="display:none;"><a href="../pcdl/reader.php?file=<?php echo $doc_id;?>"><?php echo $_local->gui->reader;?>（<?php echo $_local->gui->read_only;?>）</a></li>
 						<?php
 						if(empty($doc_head)){
 							echo '<li><a href="../studio/project.php?op=open&doc_id='.$doc_id.'&openin=editor">复制到我的空间用编辑器打开</a></li>';
 						}
 						else{
-							echo '<li><a href="../doc/fork.php?doc_id='.$doc_id.'">'.$_local->gui->pcd_studio.'</a>（'.$_local->gui->folk.$_local->gui->and.$_local->gui->edit.'）</li>';
+							echo '<li>'.$_local->gui->pcd_studio.'<a href="../doc/fork.php?doc_id='.$doc_id.'">'.$_local->gui->folk.$_local->gui->and.$_local->gui->edit.'</a></li>';
 						}
 						?>
 						

app/ucenter/function.php

@@ -1,6 +1,6 @@
 <?php
 require_once '../path.php';
-function ucenter_get($userid,$fields){
+function ucenter_get($userid,$fields="username"){
     //打开数据库
     $dns = "sqlite:"._FILE_DB_USERINFO_;
     $dbh = new PDO($dns, "", "",array(PDO::ATTR_PERSISTENT=>true));
@@ -11,7 +11,7 @@ function ucenter_get($userid,$fields){
     $fUser = $stmt->fetchAll(PDO::FETCH_ASSOC);
     $dbh=null;
     if(count($fUser)>0){
-        return($fUser[0]["username"]);
+        return($fUser[0][$fields]);
     }
     else{
         return("");

app/usent/get.php

@@ -0,0 +1,40 @@
+<?php
+/*
+get xml doc from db
+*/
+require_once "../path.php";
+require_once "../public/_pdo.php";
+require_once "../public/function.php";
+
+$book = $_GET["book"];
+$para = $_GET["para"];
+$begin = $_GET["begin"];
+$end = $_GET["end"];
+
+$dns = "sqlite:"._FILE_DB_SENTENCE_;
+$dbh = new PDO($dns, "", "",array(PDO::ATTR_PERSISTENT=>true));
+$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);  
+/* 开始一个事务，关闭自动提交 */
+
+$query="SELECT * FROM sentence WHERE (book = ?  AND paragraph = ? AND begin = ? AND end = ? and text <> '' ) order by modify_time DESC  ";
+$stmt = $dbh->prepare($query);
+$stmt->execute(array($book,$para,$begin,$end));
+$Fetch = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+    $iFetch=count($Fetch);
+    if($iFetch>0){
+        foreach ($Fetch as $key => $value) {
+            echo "<div>";
+            echo "<div>".$value["author"]."</div>";
+            echo "<div>".$value["text"]."</div>";
+            echo "</div>";
+        }
+    }
+    else{
+        echo "沙发等你来坐。";
+    }
+
+
+//echo json_encode($respond, JSON_UNESCAPED_UNICODE);
+
+?>

documents/course/join_us.md

@@ -11,7 +11,9 @@
 
 如果您接受并认可上述平台共识，那我们欢迎您在wikipali平台上公开发表这些内容。以利益他人。
 
-我们欢迎您参与此教学活动，无论是以学生，教师或是教学活动的服务者的身份。请发送电子邮件到：
+在[公共版权](https://en.wikipedia.org/wiki/Public_domain)的前提下。我们欢迎您在wikipali平台上公开发表您的笔记，译文等。以利益他人。
+
+我们欢迎您参与此教学活动，无论是以学生，教师或是教学活动的服务者的身份。
 
 ## 相关工作
 

documents/development/join_us.md

@@ -45,3 +45,5 @@
 - 能以英语或中文提出自己的意见和建议
 
 
+## 参考链接
+[Demo 功能演示版编程参考](../../app/README.md)