From b87fd00a62994d24a3708cec5f5613ed2e9a67ed Mon Sep 17 00:00:00 2001 From: xue <> Date: Tue, 30 May 2006 21:26:29 +0000 Subject: merge from 3.0 branch till 1111. --- demos/blog/protected/Common/BlogDataModule.php | 15 ++++++++- demos/blog/protected/Common/schema.sql | 6 ++++ demos/blog/protected/Data/Settings.xml | 1 + demos/blog/protected/Layouts/MainLayout.tpl | 2 ++ demos/blog/protected/Pages/Admin/ConfigMan.page | 10 ++++++ demos/blog/protected/Pages/Admin/ConfigMan.php | 2 ++ demos/blog/protected/Pages/Posts/ListPost.page | 6 ++++ demos/blog/protected/Pages/Posts/ViewPost.page | 1 + demos/blog/protected/Pages/Posts/ViewPost.php | 2 +- demos/blog/protected/Portlets/CommentPortlet.php | 39 ++++++++++++++++++++++++ demos/blog/protected/Portlets/CommentPortlet.tpl | 15 +++++++++ 11 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 demos/blog/protected/Portlets/CommentPortlet.php create mode 100644 demos/blog/protected/Portlets/CommentPortlet.tpl (limited to 'demos/blog/protected') diff --git a/demos/blog/protected/Common/BlogDataModule.php b/demos/blog/protected/Common/BlogDataModule.php index a15701ab..3dc71989 100644 --- a/demos/blog/protected/Common/BlogDataModule.php +++ b/demos/blog/protected/Common/BlogDataModule.php @@ -341,9 +341,22 @@ class BlogDataModule extends TModule return $commentRecord; } + public function queryComments($filter,$orderBy,$limit) + { + if($filter!=='') + $filter='WHERE '.$filter; + $sql="SELECT * FROM tblComments $filter $orderBy $limit"; + $result=$this->query($sql); + $rows=sqlite_fetch_all($result,SQLITE_ASSOC); + $comments=array(); + foreach($rows as $row) + $comments[]=$this->populateCommentRecord($row); + return $comments; + } + public function queryCommentsByPostID($id) { - $sql="SELECT * FROM tblComments WHERE post_id=$id"; + $sql="SELECT * FROM tblComments WHERE post_id=$id ORDER BY create_time DESC"; $result=$this->query($sql); $rows=sqlite_fetch_all($result,SQLITE_ASSOC); $comments=array(); diff --git a/demos/blog/protected/Common/schema.sql b/demos/blog/protected/Common/schema.sql index a93512df..9c111f0c 100644 --- a/demos/blog/protected/Common/schema.sql +++ b/demos/blog/protected/Common/schema.sql @@ -66,5 +66,11 @@ INSERT INTO tblPosts (id,author_id,create_time,title,content,status) INSERT INTO tblCategories (name,description,post_count) VALUES ('Miscellaneous','This category holds posts on any topic.',1); +INSERT INTO tblCategories (name,description,post_count) + VALUES ('PRADO','Topics related with the PRADO framework.',0); + +INSERT INTO tblCategories (name,description,post_count) + VALUES ('PHP','Topics related with PHP.',0); + INSERT INTO tblPost2Category (post_id,category_id) VALUES (1,1); diff --git a/demos/blog/protected/Data/Settings.xml b/demos/blog/protected/Data/Settings.xml index b097f22f..69f55370 100644 --- a/demos/blog/protected/Data/Settings.xml +++ b/demos/blog/protected/Data/Settings.xml @@ -7,6 +7,7 @@ + \ No newline at end of file diff --git a/demos/blog/protected/Layouts/MainLayout.tpl b/demos/blog/protected/Layouts/MainLayout.tpl index 87313f38..f3a77adc 100644 --- a/demos/blog/protected/Layouts/MainLayout.tpl +++ b/demos/blog/protected/Layouts/MainLayout.tpl @@ -34,6 +34,8 @@ + +