Merge commit '29d979fa388fedfb99253af3383f0185909c03ed' of http://192.168.8.117/mint/

app/article/article.js

@@ -187,7 +187,11 @@ function setMode(mode = "read") {
 		url += "&channal=" + _channal;
 	}
 	if (_display != "") {
-		url += "&display=" + _display;
+		if (mode == "read") {
+			url += "&display=" + _display;
+		} else {
+			url += "&display=sent";
+		}
 	}
 	if (mode != "") {
 		url += "&mode=" + mode;

app/article/function.php

@@ -3,8 +3,6 @@ require_once "../path.php";
 require_once "../share/function.php";
 require_once "../db/table.php";
 
-
-
 class Article extends Table
 {
     function __construct($redis=false) {

app/article/index.php

@@ -46,8 +46,14 @@ require_once "../pcdl/html_head.php";
 		echo "_mode='read';";
 	}
 	if(isset($_GET["display"])){
-		$_display = $_GET["display"];
-		echo "_display='".$_GET["display"]."';";
+		if($_mode == "edit"){
+			$_display = "sent";
+			echo "_display='sent';";	
+		}
+		else{
+			$_display = $_GET["display"];
+			echo "_display='".$_GET["display"]."';";			
+		}
 	}
 	else{
 		if($_mode=="read"){

app/reader/index.php

@@ -54,8 +54,14 @@ require_once "../pcdl/html_head.php";
 		echo "_mode='read';";
 	}
 	if(isset($_GET["display"])){
-		$_display = $_GET["display"];
-		echo "_display='".$_GET["display"]."';";
+		if($_mode == "edit"){
+			$_display = "sent";
+			echo "_display='sent';";
+		}
+		else{
+			$_display = $_GET["display"];
+			echo "_display='".$_GET["display"]."';";			
+		}
 	}
 	else{
 		if($_mode=="read"){

app/reader/reader.js

@@ -280,7 +280,11 @@ function setMode(mode = "read") {
 		url += "&channal=" + _channal;
 	}
 	if (_display != "") {
-		url += "&display=" + _display;
+		if (mode == "read") {
+			url += "&display=" + _display;
+		} else {
+			url += "&display=sent";
+		}
 	}
 	if (mode != "") {
 		url += "&mode=" + mode;