refs #1613 : bugfix : private line function does not work

Needlworks · Oct 8, 2012 · cbae70b · cbae70b
1 parent ca79cae
commit cbae70b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/interface/blog/line.php b/interface/blog/line.php
@@ -10,11 +10,13 @@
 		'key' => array('string','default'=>''),
 		'mode' => array('string','default'=>'url'),
 		'content' => array('string','default'=>''),
+		'category' => array('string','default'=>'public'),
 		'page' => array('int',1,'default'=>'')
 	),
 	'POST' => array(
 		'key' => array('string','default'=>''),
 		'mode' => array('string','default'=>'url'),
+		'category' => array('string','default'=>'public'),
 		'content' => array('string','default'=>'')
 	)
 );
@@ -28,10 +30,12 @@
 		$key = null;
 	}
 	$content = $_POST['content'];
+	$category = $_POST['category'];
 	$mode = $_POST['mode'];
 } else {
 	$key = $_GET['key'];
 	$content = $_GET['content'];
+	$category = $_GET['category'];
 	$mode = $_GET['mode'];
 }
 
@@ -42,6 +46,7 @@
 	$password = Setting::getBlogSetting('LinePassword', null, true);
 	if(($password === $key) || doesHaveOwnership()) {
 		$lineobj->content = $content;
+		$lineobj->category = $category;
 		$result = $lineobj->add();
 		fireEvent('AddLine',$result, $lineobj);
 		$cache = pageCache::getInstance();

diff --git a/interface/owner/entry/line/index.php b/interface/owner/entry/line/index.php
@@ -41,6 +41,7 @@
 $conditions['blogid'] = getBlogId();
 $conditions['page'] = $_GET['page'];
 if(isset($_GET['category'])) $conditions['category'] = $_GET['category'];
+if(isset($_POST['category'])) $conditions['category'] = $_POST['category'];
 if(isset($_POST['search'])) $conditions['keyword'] = $_POST['search'];
 $conditions['linesforpage'] = 15;
 
@@ -98,8 +99,9 @@ function getMoreContent(page,lines,mode) {
 								PM.addRequest(request, "<?php echo _t('라인을 불러오고 있습니다.');?>");
 								request.send("page="+page
 									+"&lines="+lines<?php
-									if(isset($conditions['category'])) echo '+"&category="+'.$conditions['category'];
-									if(isset($conditions['keyword'])) echo '+"&keyword='.htmlspecialchars($searchKeyword).'"';?>);
+	if(isset($conditions['category'])) echo '+"&category='.$conditions['category'].'"';
+	if(isset($conditions['keyword'])) echo '+"&keyword='.htmlspecialchars($searchKeyword).'"';
+?>);
 							}
 
 							function updateList(contentView, buttonView, position) {
@@ -131,7 +133,7 @@ function writeLine() {
 									alert("<?php echo _t('라인을 저장할 수 없었습니다.');?>");
 								}
 								PM.addRequest(request, "<?php echo _t('라인을 저장하고 있습니다.');?>");
-								request.send("content="+content+"&mode=ajax");				
+								request.send("content="+content+"&category=<?php echo $conditions['category'];?>&mode=ajax");				
 							}
 							//]]>
 						</script>