[pLog-svn] r2371 - in plog/branches/plog-1.1-daochanges:
class/action class/action/admin class/bayesian class/cache
class/dao class/dao/userdata class/data class/database
class/database/pdb/drivers class/gallery/dao class/locale
class/plugin class/summary/action class/template/templatesets
class/view/admin templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Wed Jul 27 21:47:24 GMT 2005
Author: oscar
Date: 2005-07-27 21:47:23 +0000 (Wed, 27 Jul 2005)
New Revision: 2371
Modified:
plog/branches/plog-1.1-daochanges/class/action/addcommentaction.class.php
plog/branches/plog-1.1-daochanges/class/action/addtrackbackaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/adminaddresourcealbumaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/admindeleteblogaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/admindeletelinkcategoryaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/admineditlinkcategoryaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/adminnewarticlecategoryaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/adminpostmanagementcommonaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/adminresourcesaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/adminupdateblogsettingsaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/adminupdateeditblogaction.class.php
plog/branches/plog-1.1-daochanges/class/action/admin/adminupdatelinkcategoryaction.class.php
plog/branches/plog-1.1-daochanges/class/action/blogaction.class.php
plog/branches/plog-1.1-daochanges/class/action/commentaction.class.php
plog/branches/plog-1.1-daochanges/class/action/defaultaction.class.php
plog/branches/plog-1.1-daochanges/class/action/viewarticleaction.class.php
plog/branches/plog-1.1-daochanges/class/bayesian/bayesianfilterutils.class.php
plog/branches/plog-1.1-daochanges/class/cache/bloginfomanager.class.php
plog/branches/plog-1.1-daochanges/class/cache/cachemanager.class.php
plog/branches/plog-1.1-daochanges/class/dao/article.class.php
plog/branches/plog-1.1-daochanges/class/dao/articlecategories.class.php
plog/branches/plog-1.1-daochanges/class/dao/articlecategory.class.php
plog/branches/plog-1.1-daochanges/class/dao/articlecomments.class.php
plog/branches/plog-1.1-daochanges/class/dao/articlenotifications.class.php
plog/branches/plog-1.1-daochanges/class/dao/articles.class.php
plog/branches/plog-1.1-daochanges/class/dao/blogarticles.class.php
plog/branches/plog-1.1-daochanges/class/dao/blogcategories.class.php
plog/branches/plog-1.1-daochanges/class/dao/blogcategory.class.php
plog/branches/plog-1.1-daochanges/class/dao/bloginfo.class.php
plog/branches/plog-1.1-daochanges/class/dao/blogs.class.php
plog/branches/plog-1.1-daochanges/class/dao/commentscommon.class.php
plog/branches/plog-1.1-daochanges/class/dao/model.class.php
plog/branches/plog-1.1-daochanges/class/dao/mylink.class.php
plog/branches/plog-1.1-daochanges/class/dao/mylinks.class.php
plog/branches/plog-1.1-daochanges/class/dao/mylinkscategories.class.php
plog/branches/plog-1.1-daochanges/class/dao/mylinkscategory.class.php
plog/branches/plog-1.1-daochanges/class/dao/trackback.class.php
plog/branches/plog-1.1-daochanges/class/dao/trackbacks.class.php
plog/branches/plog-1.1-daochanges/class/dao/usercomment.class.php
plog/branches/plog-1.1-daochanges/class/dao/userdata/baseuserdataprovider.class.php
plog/branches/plog-1.1-daochanges/class/dao/userdata/ploguserdataprovider.class.php
plog/branches/plog-1.1-daochanges/class/dao/userinfo.class.php
plog/branches/plog-1.1-daochanges/class/data/timestamp.class.php
plog/branches/plog-1.1-daochanges/class/database/db.class.php
plog/branches/plog-1.1-daochanges/class/database/dbobject.class.php
plog/branches/plog-1.1-daochanges/class/database/pdb/drivers/pdbdriverbase.class.php
plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryalbum.class.php
plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryalbums.class.php
plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresource.class.php
plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresourcequotas.class.php
plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresources.class.php
plog/branches/plog-1.1-daochanges/class/locale/locales.class.php
plog/branches/plog-1.1-daochanges/class/plugin/pluginbase.class.php
plog/branches/plog-1.1-daochanges/class/summary/action/activeaccountaction.class.php
plog/branches/plog-1.1-daochanges/class/template/templatesets/templatesets.class.php
plog/branches/plog-1.1-daochanges/class/template/templatesets/templatesetstorage.class.php
plog/branches/plog-1.1-daochanges/class/view/admin/adminarticlecategorieslistview.class.php
plog/branches/plog-1.1-daochanges/class/view/admin/adminblogcategorieslistview.class.php
plog/branches/plog-1.1-daochanges/class/view/admin/adminblogsettingsview.class.php
plog/branches/plog-1.1-daochanges/class/view/admin/adminnewpostview.class.php
plog/branches/plog-1.1-daochanges/templates/admin/blogcategories.template
plog/branches/plog-1.1-daochanges/templates/admin/blogtemplatechooser.template
plog/branches/plog-1.1-daochanges/templates/admin/dashboard.template
plog/branches/plog-1.1-daochanges/templates/admin/editlinks.template
plog/branches/plog-1.1-daochanges/templates/admin/editpost.template
plog/branches/plog-1.1-daochanges/templates/admin/newpost.template
plog/branches/plog-1.1-daochanges/templates/admin/resourcelist.template
plog/branches/plog-1.1-daochanges/templates/admin/userpictureselect.template
Log:
these are all my changes so far. I've added a few new methods to Model such as Model::get,
Model::update, Model::add, Model::delete, Model::getMany and Model::getAll which take care
of dealing with caching objects in a transparent way (well, sort of) Saving and updating
objects to the db is now also automatic provided that the object extends the DbObject class
and provides an array called $_fields with the name of the fields that should be mapped to the
db and the required 'getters'.
I have also removed many redundant methods from the DAO classes so that we can save some
precious memory... it makes no sense to load always a method that will only be used in one place! If
you notice anything missing, please let me know.
This branch should work as it is now, and it should work quite fast as most of the data loaded
from the database is cached until changed. The only thing that won't work is when custom urls,
as most of the methods that load categories or posts given a category name are not working yet.
Other than that, use at your own risk :)
Modified: plog/branches/plog-1.1-daochanges/class/action/addcommentaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/addcommentaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/addcommentaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -162,28 +162,26 @@
// we have already checked all the data, so we are sure that everything's in place
$comments = new ArticleComments();
- $comment = new UserComment( $this->_articleId, $this->_parentId, $this->_commentTopic, $this->_commentText,
- null, $this->_userName, $this->_userEmail, $this->_userUrl,
+ $comment = new UserComment( $this->_articleId,
+ $this->_blogInfo->getId(),
+ $this->_parentId,
+ $this->_commentTopic,
+ $this->_commentText,
+ null,
+ $this->_userName,
+ $this->_userEmail,
+ $this->_userUrl,
$clientIp );
- // check if there is already a comment with the same text, topic and made from the same
- // IP already in the database because if so, then we will not add the comment that
- // the user is trying to add (a reload button mistake, perhaps?)
- if( !$comments->getIdenticalComment( $this->_commentTopic, $this->_commentText,
- $this->_articleId, $this->_parentId,
- $this->_userName, $this->_userEmail,
- $this->_userUrl, $clientIp )) {
-
- // fire an event
- $this->notifyEvent( EVENT_PRE_COMMENT_ADD, Array( "comment" => &$comment ));
-
- if( !$comments->addComment( $comment )) {
- // show an error message if problems
- $this->_view = new ErrorView( $this->_blogInfo );
- $this->_view->setValue( "message", "error_adding_comment" );
- $this->setCommonData();
- return false;
- }
+ // fire an event
+ $this->notifyEvent( EVENT_PRE_COMMENT_ADD, Array( "comment" => &$comment ));
+
+ if( !$comments->addComment( $comment )) {
+ // show an error message if problems
+ $this->_view = new ErrorView( $this->_blogInfo );
+ $this->_view->setValue( "message", "error_adding_comment" );
+ $this->setCommonData();
+ return false;
}
// finally, check if there was any user who wanted to be notified of new comments
Modified: plog/branches/plog-1.1-daochanges/class/action/addtrackbackaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/addtrackbackaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/addtrackbackaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -115,7 +115,14 @@
// create teh trackback object
$now = new Timestamp();
$ip = Client::getIp();
- $trackback = new Trackback( $url, $title, $articleId, $excerpt, $blogName, $now->getTimestamp(), $ip );
+ $trackback = new Trackback( $url,
+ $title,
+ $articleId,
+ $this->_blogInfo->getId(),
+ $excerpt,
+ $blogName,
+ $now->getTimestamp(),
+ $ip );
// this code probably needs some explanation...
// Basically, if the bayesian filter is configured to save spam to the database marked as spam,
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/adminaddresourcealbumaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/adminaddresourcealbumaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/adminaddresourcealbumaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -7,6 +7,7 @@
include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
/**
* \ingroup Action
@@ -47,7 +48,7 @@
$this->_parentId = $this->_request->getValue( "parentId" );
// create the album
- $albums = new GalleryAlbums();
+ $albums = new GalleryAlbums();
$t = new Timestamp();
$album = new GalleryAlbum( $this->_blogInfo->getId(), $this->_albumName,
$this->_albumDescription,
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/admindeleteblogaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/admindeleteblogaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/admindeleteblogaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -44,6 +44,8 @@
$this->_disableBlogs();
}
+
+ function disableBlog( $blogIn
/**
* @private
@@ -72,7 +74,9 @@
$errorMessage .= $this->_locale->pr("error_blog_is_default_blog", $blogInfo->getBlog())."<br />";
}
else {
- if( $blogs->disableBlog( $blogId )) {
+ // disable the blog
+ $blogInfo->setStatus( BLOG_STATUS_DISABLED );
+ if( $blogs->updateBlog( $blogInfo )) {
$totalOk++;
if( $totalOk < 2 )
$successMessage = $this->_locale->pr("blog_deleted_ok", $blogInfo->getBlog());
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/admindeletelinkcategoryaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/admindeletelinkcategoryaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/admindeletelinkcategoryaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -66,7 +66,6 @@
// fetch the category
$linkCategory = $categories->getMyLinksCategory( $categoryId, $this->_blogInfo->getId());
if( $linkCategory ) {
- //if( $categories->getNumMyLinksCategory( $categoryId ) > 0 ) {
if( $linkCategory->getNumLinks() > 0 ) {
$errorMessage .= $this->_locale->pr("error_links_in_link_category",$linkCategory->getName())."<br/>";
}
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/admineditlinkcategoryaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/admineditlinkcategoryaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/admineditlinkcategoryaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -4,6 +4,7 @@
include_once( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
include_once( PLOG_CLASS_PATH."class/view/admin/adminlinkcategorieslistview.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+ include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
/**
* \ingroup Action
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/adminnewarticlecategoryaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/adminnewarticlecategoryaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/adminnewarticlecategoryaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -36,7 +36,7 @@
$categories = new ArticleCategories();
$blogSettings = $this->_blogInfo->getSettings();
$categoriesOrder = $blogSettings->getValue( "categories_order" );
- $blogCategories = $categories->getBlogCategoriesAdmin( $this->_blogInfo->getId(), false, $categoriesOrder );
+ $blogCategories = $categories->getBlogCategories( $this->_blogInfo->getId(), false, $categoriesOrder );
$this->_view->setValue( "categories", $blogCategories );
// this field should be true by default
$this->_view->setValue( "categoryInMainPage", true );
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/adminpostmanagementcommonaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/adminpostmanagementcommonaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/adminpostmanagementcommonaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -97,8 +97,8 @@
if( !$this->_config->getValue( "xmlrpc_ping_enabled", false ))
return "";
- $blogs = new Blogs();
- $resultArray = $blogs->updateNotify( $this->_blogInfo );
+ $notifications = new ArticleNotifications();
+ $resultArray = $notifications->updateNotify( $this->_blogInfo );
// check to prevent throwing an error if the list is empty
if( $resultArray == "" || empty( $resultArray ))
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/adminresourcesaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/adminresourcesaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/adminresourcesaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -4,6 +4,7 @@
include_once( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
+ include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
/**
* \ingroup Action
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/adminupdateblogsettingsaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/adminupdateblogsettingsaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/adminupdateblogsettingsaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -57,7 +57,7 @@
// fetch the settings from the db and update them accordingly
$blogs = new Blogs();
- $blogSettings = $blogs->getBlogSettings( $this->_blogInfo->getId());
+ $blogSettings = $this->_blogInfo->getSettings();
$blogSettings->setValue( "locale", $this->_request->getValue( "blogLocale" ));
$blogSettings->setValue( "show_posts_max", $this->_request->getValue( "blogMaxMainPageItems" ));
$blogSettings->setValue( "recent_posts_max", $this->_request->getValue( "blogMaxRecentItems" ));
@@ -81,7 +81,7 @@
$blogs = new Blogs();
$this->notifyEvent( EVENT_PRE_BLOG_UPDATE, Array( "blog" => &$this->_blogInfo ));
$blogInfoManager = BlogInfoManager::getBlogInfoManager();
- if( !$blogInfoManager->updateBlogInfo( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogInfoManager->updateBlogInfo( $this->_blogInfo )) {
$this->_view = new AdminBlogSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/adminupdateeditblogaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/adminupdateeditblogaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/adminupdateeditblogaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -52,15 +52,6 @@
$this->setValidationErrorView( $view );
}
- /**
- * updates the users of the blog
- * @private
- */
- function updateBlogUsers()
- {
-
- }
-
/**
* Carries out the specified action
*/
@@ -117,7 +108,7 @@
// and now update the settings in the database
$this->notifyEvent( EVENT_PRE_BLOG_UPDATE, Array( "blog" => &$blogInfo ));
- if( !$blogs->updateBlog( $blogInfo->getId(), $blogInfo )) {
+ if( !$blogs->updateBlog( $blogInfo )) {
$this->_view = new AdminSiteBlogsListView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->pr( "error_updating_blog_settings", $blogInfo->getBlog()));
$this->setCommonData();
Modified: plog/branches/plog-1.1-daochanges/class/action/admin/adminupdatelinkcategoryaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/admin/adminupdatelinkcategoryaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/admin/adminupdatelinkcategoryaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -5,6 +5,7 @@
include_once( PLOG_CLASS_PATH."class/view/admin/adminlinkcategorieslistview.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+ include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
/**
* \ingroup Action
Modified: plog/branches/plog-1.1-daochanges/class/action/blogaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/blogaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/blogaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -265,4 +265,4 @@
return true;
}
}
-?>
+?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/action/commentaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/commentaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/commentaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -72,7 +72,7 @@
$postComments = $comments->getPostComments( $article->getId());
if( $this->_parentId > 0 ) {
// get a pre-set string for the subject field, for those users interested
- $comment = $comments->getPostComment( $article->getId(), $this->_parentId );
+ $comment = $comments->getPostComment( $this->_parentId, $article->getId());
// create the string
if( $comment ) {
$replyString = $this->_locale->tr("reply_string").$comment->getTopic();
Modified: plog/branches/plog-1.1-daochanges/class/action/defaultaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/defaultaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/defaultaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -178,7 +178,7 @@
$blogArticles = $this->articles->getBlogArticles( $blogId, $this->_date,
$this->_postAmount, $this->_categoryId,
POST_STATUS_PUBLISHED, $this->_userId, $todayTimestamp );
- }
+ }
// if we couldn't fetch the articles, send an error and quit
if( count($blogArticles) == 0 ) {
Modified: plog/branches/plog-1.1-daochanges/class/action/viewarticleaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/action/viewarticleaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/action/viewarticleaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -78,12 +78,7 @@
* updates the article referrers, given a slug
*/
function _updateArticleReferrersByTitle($slug){
- $id = 0;
- $article = $this->articles->getBlogArticleByTitle($slug);
- if ( $article )
- {
- $id = $article->getId();
- }
+ $id = $this->articles->getArticleIdFromName($slug);
// if the article isn't found, we will save a referrer to
// the main page, since $id will be 0.
$this->_updateArticleReferrersById($id);
Modified: plog/branches/plog-1.1-daochanges/class/bayesian/bayesianfilterutils.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/bayesian/bayesianfilterutils.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/bayesian/bayesianfilterutils.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -32,29 +32,7 @@
*/
function markArticlesAsNonSpam( $blogId = 0 )
{
- // first, gather all posts that should be used to gather "good"
- // for for the filter
- $articles = new Articles();
- if( $blogId == 0 )
- $blogArticles = $articles->getAllArticles();
- else
- $blogArticles = $articles->getBlogArticles( $blogId );
-
- // now, loop through each one of them marking the contents as
- // non-spam
- $bayesian = new BayesianFilterCore();
- foreach( $blogArticles as $article ) {
- $owner = $article->getUserInfo();
- $bayesian->train( $article->getBlog(),
- $article->getTopic(),
- $article->getText(),
- $owner->getUsername(),
- $owner->getEmail(),
- "",
- false );
- }
-
- return true;
+ die("is this even used!?");
}
/**
@@ -62,35 +40,7 @@
*/
function _getAllComments( $blogId = 0 )
{
- // we shouldn't be doing things like this but it actually makes things
- // easier... we need to find the blog to which a comment belongs, but turns
- // out that there is no reference to the blog table from the comment table...
- // the solution, as you can see, is to run a nice join query that will
- // give us as much information as we need :)
- $query = "SELECT c.id AS id, c.topic AS topic, c.text AS text,
- c.user_email AS user_email, c.user_name AS user_name,
- c.user_url AS user_url, a.id AS article_id, a.blog_id AS blog_id
- FROM ".$this->getPrefix()."articles_comments AS c,".$this->getPrefix()."articles AS a
- WHERE c.article_id = a.id";
-
- if( $blogId != 0 ) {
- $query .= " AND a.blog_id = $blogId";
- }
-
- $result = $this->Execute( $query );
-
- $comments = Array();
-
- // return empty array if problems...
- if( !$result )
- return $comments;
-
- // or continue anyway
- while ($row = $result->FetchRow()) {
- array_push( $comments, $row );
- }
-
- return $comments;
+ die("is this even used!?");
}
/**
@@ -104,23 +54,7 @@
*/
function markCommentsAsNonSpam( $blogId = 0 )
{
- // first, make an array with the comments that should be marked
- $comments = $this->_getAllComments( $blogId );
-
- // now, loop through each one of them marking the contents as
- // non-spam
- $bayesian = new BayesianFilterCore();
- foreach( $comments as $comment ) {
- $bayesian->train( $comment["blog_id"],
- $comment["topic"],
- $comment["text"],
- $comment["user_name"],
- $comment["user_email"],
- $comment["user_url"],
- false );
- }
-
- return true;
+ die("is this even used!?");
}
}
?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/cache/bloginfomanager.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/cache/bloginfomanager.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/cache/bloginfomanager.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -34,11 +34,11 @@
return $blogInfo;
}
- function updateBlogInfo( $blogId, $blogInfo )
+ function updateBlogInfo( $blogInfo )
{
require_once( PLOG_CLASS_PATH . "class/dao/blogs.class.php" );
$blogs = new Blogs();
- return $blogs->updateBlog( $blogId, $blogInfo );
+ return $blogs->updateBlog( $blogInfo );
// remove all cached info
$cache =& CacheManager::getCache();
Modified: plog/branches/plog-1.1-daochanges/class/cache/cachemanager.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/cache/cachemanager.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/cache/cachemanager.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -12,16 +12,13 @@
define( "CACHE_USERIDBYNAME", "userinfo_idbyname" );
define( "CACHE_BLOGINFOS", "bloginfo" );
define( "CACHE_BLOGIDBYNAME", "bloginfo_idbyname" );
- define( "CACHE_ARTICLETEXT", "article_text" );
define( "CACHE_TRACKBACKS", "trackbacks" );
define( "CACHE_NUMTRACKBACKS", "trackbacks_size" );
define( "CACHE_CONFIGDBSTORAGE", "config_db_storage" );
define( "CACHE_SITEADMINS", "permissions_siteadmin" );
define( "CACHE_BLOGLINKS", "blogLinks" );
define( "CACHE_MYLINKS", "myBlogLinks" );
- define( "CACHE_ARTICLES", "articles" );
- define( "CACHE_ARTICLETITLES", "articles_titles" );
-
+
// :TODO: implement a cache-lifetime per cache-category, so e.g. blogInfo or
// locales have a lifetime of several days, whereas articles, comments,
// etc will only be cached for an hour.
Modified: plog/branches/plog-1.1-daochanges/class/dao/article.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/article.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/article.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -12,7 +12,7 @@
* \ingroup DAO
* This class represents an article from the database, and provides methods to access all its objects.
*/
- class Article extends Object
+ class Article extends DbObject
{
/**
@@ -26,16 +26,19 @@
var $_categories;
var $_user;
var $_date;
+ var $_modificationDate;
var $_timestamp;
+ var $_modificationTimestamp;
var $_comments;
var $_userInfo;
var $_blog;
var $_blogInfo;
var $_status;
var $_totalComments;
- var $_totalRealComments;
+ var $_numComments;
var $_numReads;
var $_numTrackbacks;
+ var $_totalTrackbacks;
var $_properties;
var $_timeOffset;
var $_fields;
@@ -66,13 +69,16 @@
$this->_topic = $topic;
$this->_text = $text;
$this->_categoryIds = $categories;
+ $this->_categories = null;
$this->_user = $user;
$this->_blog = $blog;
$this->_id = $id;
$this->_status = $status;
$this->_comments = null;
$this->_totalComments = 0;
+ $this->_numComments = 0;
$this->_numTrackbacks = 0;
+ $this->_totalTrackbacks = 0;
$this->_numReads = $numReads;
if( $slug == "" ) {
include_once( PLOG_CLASS_PATH.'class/data/textfilter.class.php' );
@@ -83,6 +89,8 @@
// by default it'll have current time
$this->_timestamp = new Timestamp();
$this->_date = $this->_timestamp->getTimestamp();
+ $this->_modificationTimestamp = new Timestamp();
+ $this->_modificationDate = $this->_timestamp->getTimestamp();
//$this->_timestamp = 0;
//$this->_date = 0;
$this->_properties = $properties;
@@ -90,8 +98,23 @@
$this->_fields = null;
$this->_trackbacks = null;
$this->_userInfo = null;
+ $this->_blogInfo = null;
- //print_r($this);
+ $this->_pk = "id";
+ $this->_fields = Array(
+ "date" => "getDate",
+ "modification_date" => "getModificationDate",
+ "user_id" => "getUserId",
+ "blog_id" => "getBlogId",
+ "status" => "getStatus",
+ "num_reads" => "getNumReads",
+ "properties" => "getProperties",
+ "slug" => "getPostSlug",
+ "num_comments" => "getTotalComments",
+ "num_trackbacks" => "getTotalTrackbacks",
+ "num_nonspam_trackbacks" => "getNumTrackbacks",
+ "num_nonspam_comments" => "getNumComments"
+ );
}
/**
@@ -198,6 +221,14 @@
*/
function getCategories()
{
+ if( $this->_categories == null ) {
+ include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+ foreach( $this->getCategoryIds() as $categoryId ) {
+ if(( $category = $categories->getCategory( $categoryId )))
+ $this->_categories[] = $category;
+ }
+ }
+
return $this->_categories;
}
@@ -386,7 +417,13 @@
*/
function getBlogInfo()
{
- return $this->_blogInfo;
+ if( $this->_blogInfo == null ) {
+ include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ $blogs = new Blogs();
+ $this->_blogInfo = $blogs->getBlogInfo( $this->getBlogId());
+ }
+
+ return( $this->_blogInfo );
}
/**
@@ -553,60 +590,44 @@
}
/**
+ * Returns the total number of comments that this post has (only the number!!)
+ *
+ * @return An integer containing the total number of comments that this post has.
+ */
+ function getTotalComments()
+ {
+ return( $this->_totalComments );
+ }
+
+ /**
* Returns the number of comments that this post has (only the number!!)
*
- * @param onlyActive return only the number of active (as in non-spam, etc)
* @return An integer containing the number of comments that this post has.
*/
- function getTotalComments( $onlyActive = true )
+ function getNumComments()
{
- // trigger the loading of the comments
- $this->getComments( $onlyActive );
-
- if( $onlyActive ) {
- $num = 0;
- foreach( $this->_comments as $comment ) {
- if( $comment->getStatus() == COMMENT_STATUS_NONSPAM )
- $num++;
- }
- }
- else
- $num = count( $this->_comments );
-
- return( $num );
- }
+ return( $this->_numComments );
+ }
/**
+ * Returns the total number of trackback pings that this post has received.
+ *
+ * @return An integer representing the number of trackback pings.
+ */
+ function getTotalTrackbacks()
+ {
+ return( $this->_totalTrackbacks );
+ }
+
+ /**
* Returns the number of trackback pings that this post has received.
*
* @param onlyActive return only the number of active (as in non-spam, etc)
* @return An integer representing the number of trackback pings.
- */
- function getNumTrackbacks( $onlyActive = true )
- {
- // trigger the loading of the comments
- $this->getTrackbacks( $onlyActive );
-
- if( $onlyActive ) {
- $num = 0;
- foreach( $this->_trackbacks as $trackback ) {
- if( $trackback->getStatus() == COMMENT_STATUS_NONSPAM )
- $num++;
- }
- }
- else
- $num = count( $this->_trackbacks );
-
- return( $num );
- }
-
- /**
- * alias for the one above
- * @see getNumTrackbacks
- */
- function getTotalTrackbacks( $onlyActive = true )
+ */
+ function getNumTrackbacks()
{
- return( $this->getNumTrackbacks( $onlyActive ));
+ return( $this->_numTrackbacks );
}
/**
@@ -618,6 +639,14 @@
{
$this->_totalComments = $totalComments;
}
+
+ /**
+ * @private
+ */
+ function setNumComments( $numComments )
+ {
+ $this->_numComments = $numComments;
+ }
/**
* @private
@@ -626,6 +655,14 @@
{
$this->_numTrackbacks = $numTrackbacks;
}
+
+ /**
+ * @private
+ */
+ function setTotalTrackbacks( $totalTrackbacks )
+ {
+ $this->_totalTrackbacks = $totalTrackbacks;
+ }
/**
* @private
@@ -638,6 +675,22 @@
$this->_timestamp = new Timestamp( $newDate );
}
+
+ function setModificationDate( $newDate )
+ {
+ $this->_modificationDate = $newDate;
+ $this->_modificationTimestamp = new Timestamp( $newDate );
+ }
+
+ function getModificationDate()
+ {
+ return( $this->_modificationDate );
+ }
+
+ function getModificationTimestamp()
+ {
+ return( $this->_modificationTimestamp );
+ }
/**
* Returns the Timestamp object representing the date when this post was posed.
@@ -726,7 +779,7 @@
*/
function setFields( $fields )
{
- $this->_fields = $fields;
+ $this->_customFields = $fields;
return true;
}
@@ -738,15 +791,15 @@
*/
function getFields()
{
- if( is_null($this->_fields) ) {
+ if( is_null($this->_customFields) ) {
include_once( PLOG_CLASS_PATH.'class/dao/customfields/customfieldsvalues.class.php' );
// get the custom fields
$customFields = new CustomFieldsValues();
$fields = $customFields->getArticleCustomFieldsValues( $this->getId(), $this->getBlog());
- $this->setFields( $fields );
- }
+ $this->setFields( $fields );
+ }
- return $this->_fields;
+ return $this->_customFields;
}
/**
@@ -853,18 +906,6 @@
}
/**
- * left here for compatilibity reasons, but please use getDateObject
- * and then Locale::formatDate for formatting dates
- * @deprecated
- * @see Locale::formatDate
- * @see Article::getDateObject
- */
- function getDay()
- {
- return( $this->_timestamp->getDay());
- }
-
- /**
* returns the previous article in time
*
* @return an Article object representing the previous article, in time, in the database
Modified: plog/branches/plog-1.1-daochanges/class/dao/articlecategories.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/articlecategories.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/articlecategories.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -14,6 +14,14 @@
define( "BLOG_CATEGORIES_ALPHABETICAL_ORDER", 4 );
define( "BLOG_CATEGORIES_REVERSE_ALPHABETICAL_ORDER", 5 );
define( "BLOG_CATEGORIES_MOST_ARTICLES_FIRST", 6 );
+
+ /**
+ * cache ids used by this class
+ */
+ define( "CACHE_ARTICLE_CATEGORIES", "article_categories" );
+ define( "CACHE_ARTICLE_CATEGORIES_BYNAME", "article_categories_byname" );
+ define( "CACHE_ARTICLE_CATEGORIES_BLOG", "article_categories_blog" );
+ define( "CACHE_ARTICLE_CATEGORIES_LINK", "article_categories_link" );
/**
* \ingroup DAO
@@ -30,9 +38,8 @@
function ArticleCategories()
{
$this->Model();
-
- $this->totalCategories = Array();
- $this->cache = Array();
+
+ $this->table = $this->getPrefix()."articles_categories";
}
/**
@@ -44,18 +51,15 @@
*/
function getCategory( $categoryId, $blogId = -1 )
{
- // check if we already loaded that category
- if( isset($this->cache[$categoryId])) {
- return $this->cache[$categoryId];
- }
-
- // if not, do the normal process...
- $query = "SELECT * FROM ".$this->getPrefix()."articles_categories WHERE id = ".Db::qstr($categoryId);
- if( $blogId != -1 )
- $query .= " AND blog_id = ".$blogId;
- $query .= ";";
-
- return $this->_getCategoryFromQuery( $query );
+ $category = $this->get( "id", $categoryId,
+ CACHE_ARTICLE_CATEGORIES,
+ Array( CACHE_ARTICLE_CATEGORIES_BYNAME => "getMangledName" ));
+ if( !$category )
+ return false;
+ if( $blogId > -1 && $category->getBlogId() != $blogId )
+ return false;
+
+ return( $category );
}
/**
@@ -67,70 +71,18 @@
*/
function getCategoryByName( $categoryName, $blogId = -1 )
{
- // if not, do the normal process...
- $query = "SELECT * FROM ".$this->getPrefix()."articles_categories WHERE
- mangled_name = '".Db::qstr($categoryName)."'";
- if( $blogId != -1 )
- $query .= " AND blog_id = ".$blogId;
- $query .= ";";
-
- return $this->_getCategoryFromQuery( $query );
+ $category = $this->get( "mangled_name", $categoryName,
+ CACHE_ARTICLE_CATEGORIES_BYNAME,
+ Array( CACHE_ARTICLE_CATEGORIES => "getId" ));
+ if( !$category )
+ return false;
+ if( $blogId > -1 && $category->getBlogId() != $blogId )
+ return false;
+
+ return( $category );
}
/**
- * @private
- */
- function _getCategoryFromQuery( $query )
- {
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- if( $result->RowCount() == 0 )
- return false;
-
- $row = $result->FetchRow($result);
- if( !array_key_exists('num_articles', $row) )
- $row['num_articles'] = 0;
- $category = $this->_fillCategoryInformation( $row );
- $categoryId = $category->getId();
-
- // ...and store the result
- $this->cache[$categoryId] = $category;
-
- return $category;
- }
-
- /**
- * Returns all the categories in the database
- *
- * @param onlyInMainPage Whether we should return only the categories that are meant to appear in the
- * main page. Disabled by default.
- * @return An array containing <b>all</b> the categories from the database.
- */
- function getAllCategories( $onlyInMainPage = false )
- {
- $query = "SELECT * FROM ".$this->getPrefix()."articles_categories ";
- if( $onlyInMainPage )
- $query .= " WHERE in_main_page = 1 ";
- $query .= " ORDER BY id ASC;";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return Array();
-
- $categories = array();
- while( $row = $result->FetchRow( $result )) {
- $category = $this->_fillCategoryInformation( $row );
- $categories[$category->getId()] = $category;
- }
-
- return $categories;
- }
-
- /**
* Returns the categories that belong to a given blog
*
* @param blogId The identifer of the blog from which we want to fetch the
@@ -158,152 +110,53 @@
*/
function getBlogCategories( $blogId, $onlyInMainPage = false, $order = BLOG_CATEGORIES_DEFAULT_ORDER, $searchTerms = "", $page = -1, $itemsPerPage = 15 )
{
- // this part of the query is the same in all the cases
- $prefix = $this->getPrefix();
- $query = "SELECT c.id AS id, c.name AS name, c.url AS url, c.blog_id AS blog_id,
- c.last_modification AS last_modification, c.in_main_page AS in_main_page,
- c.parent_id AS parent_id, c.description AS description, c.properties AS properties,
- c.mangled_name AS mangled_name, IF(a.id IS NULL, 0, COUNT(*)) AS num_articles, a.date AS last_update
- FROM {$prefix}articles_categories c LEFT JOIN {$prefix}article_categories_link l
- ON c.id=l.category_id LEFT JOIN {$prefix}articles a ON a.id = l.article_id";
-
- if( $onlyInMainPage )
- $whereMainPage .= "c.in_main_page = 1 ";
- if( $searchTerms )
- $whereSearch = $this->buildSearchCondition( $searchTerms );
- $whereBlogId = "c.blog_id = '".Db::qstr($blogId)."'";
+ $categories = $this->getMany( "blog_id",
+ $blogId,
+ CACHE_ARTICLE_CATEGORIES_BLOG,
+ Array( CACHE_ARTICLE_CATEGORIES => "getId",
+ CACHE_ARTICLE_CATEGORIES_BYNAME => "getMangledName" ),
+ $page,
+ $itemsPerPage );
- $where = $this->buildWhereCondition( Array( $whereMainPage, $whereSearch, $whereBlogId ));
-
- $query .= " $where GROUP BY c.id ";
-
- // and now we simply have to change select the correct way of ordering things
- if( $order == BLOG_CATEGORIES_OLDEST_FIRST ) {
- $query .= " ORDER BY c.last_modification ASC;";
- }
- elseif( $order == BLOG_CATEGORIES_NEWEST_FIRST ) {
- $query .= " ORDER BY c.last_modification DESC;";
- }
- elseif( $order == BLOG_CATEGORIES_ALPHABETICAL_ORDER ) {
- $query .= " ORDER BY c.name ASC";
- }
- elseif( $order == BLOG_CATEGORIES_REVERSE_ALPHABETICAL_ORDER ) {
- $query .= " ORDER BY c.name DESC";
- }
- elseif( $order == BLOG_CATEGORIES_MOST_ARTICLES_FIRST ) {
- $query .= " ORDER BY num_articles DESC, name ASC;";
- }
- elseif( $order == BLOG_CATEGORIES_MOST_RECENT_UPDATED_FIRST ) {
- $query .= "ORDER BY last_update DESC, name ASC;";
- }
-
- return $this->_getBlogCategoriesFromQuery( $query, $page, $itemsPerPage );
- }
-
- /**
- * @see Model::buildSearchCondition
- */
- function buildSearchCondition( $searchTerms )
- {
- $searchTerms = trim($searchTerms);
- $searchCond = "(description LIKE '%".Db::qstr($searchTerms)."%' OR name LIKE '%".Db::qstr($searchTerms)."%')";
-
- return( $searchCond );
+ /**
+ * :TODO:
+ * implement the ordering conditions!
+ */
+
+ $result = Array();
+ if( $onlyInMainPage && $categories ) {
+ foreach( $categories as $category )
+ if( $category->getInMainPage())
+ $result[] = $categories;
+ }
+ else
+ $result = $categories;
+
+ return( $result );
}
/**
- * @see getBlogCategories
- */
- function getBlogCategoriesAdmin( $blogId, $onlyInMainPage = false, $order = BLOG_CATEGORIES_DEFAULT_ORDER, $searchTerms = "", $page = -1, $itemsPerPage = 15 )
- {
- // this part of the query is the same in all the cases
- $prefix = $this->getPrefix();
- $query = "SELECT c.id AS id, c.name AS name, c.url AS url, c.blog_id AS blog_id,
- c.last_modification AS last_modification, c.in_main_page AS in_main_page,
- c.parent_id AS parent_id, c.properties AS properties, c.description AS description,
- c.mangled_name AS mangled_name, IF(a.id IS NULL, 0, COUNT(*)) AS num_articles, a.date AS last_update
- FROM {$prefix}articles_categories c LEFT JOIN {$prefix}article_categories_link l
- ON c.id=l.category_id LEFT JOIN {$prefix}articles a ON a.id = l.article_id";
-
- if( $onlyInMainPage )
- $whereMainPage .= "c.in_main_page = 1 ";
- if( $searchTerms )
- $whereSearch = $this->buildSearchCondition( $searchTerms );
- $whereBlogId = "c.blog_id = '".Db::qstr($blogId)."'";
-
- $where = $this->buildWhereCondition( Array( $whereMainPage, $whereSearch, $whereBlogId ));
-
- $query .= " $where GROUP BY c.id ";
-
- // and now we simply have to change select the correct way of ordering things
- if( $order == BLOG_CATEGORIES_OLDEST_FIRST ) {
- $query .= " ORDER BY c.last_modification ASC";
- }
- elseif( $order == BLOG_CATEGORIES_NEWEST_FIRST ) {
- $query .= " ORDER BY c.last_modification DESC";
- }
- elseif( $order == BLOG_CATEGORIES_ALPHABETICAL_ORDER ) {
- $query .= " ORDER BY c.name ASC";
- }
- elseif( $order == BLOG_CATEGORIES_REVERSE_ALPHABETICAL_ORDER ) {
- $query .= " ORDER BY c.name DESC";
- }
- elseif( $order == BLOG_CATEGORIES_MOST_ARTICLES_FIRST ) {
- $query .= " ORDER BY num_articles DESC, name ASC";
- }
- elseif( $order == BLOG_CATEGORIES_MOST_RECENT_UPDATED_FIRST ) {
- $query .= "ORDER BY last_update DESC, name ASC";
- }
-
- return $this->_getBlogCategoriesFromQuery( $query, $page, $itemsPerPage );
- }
-
- /**
* @private
*/
- function _getBlogCategoriesFromQuery( $query, $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
+ function mapRow( $row )
{
- $result = $this->Execute( $query, $page, $itemsPerPage );
+ $category = new ArticleCategory( $row["name"],
+ $row["url"],
+ $row["blog_id"],
+ $row["in_main_page"],
+ $row["description"],
+ $row["num_articles"],
+ unserialize($row["properties"]),
+ $row["id"]);
+ $category->setNumArticles( $row["num_articles"] );
+ $category->setNumPublishedArticles( $row["num_published_articles"] );
+ $category->setLastModification( $row["last_modification"] );
- if( !$result )
- return false;
-
- $categories = Array();
- while( $row = $result->FetchRow( $result )) {
- $category = $this->_fillCategoryInformation( $row );
- $categories[$category->getId()] = $category;
-
- // we can cache this information for later...
- $this->cache[$category->getId()] = $category;
- }
-
- return $categories;
+ return( $category );
}
/**
- * Private function that takes an associative array from the database and returns
- * an object of the type ArticleCategory properly filled
- *
- * @param query_result Resulting resource of executing a query
- * @return Returns an ArticleCategory object
- * @private
- */
- function _fillCategoryInformation( $query_result )
- {
- $category = new ArticleCategory( $query_result["name"],
- $query_result["url"],
- $query_result["blog_id"],
- $query_result["in_main_page"],
- $query_result["description"],
- $query_result["num_articles"],
- unserialize($query_result["properties"]),
- $query_result["id"]);
-
- return $category;
- }
-
- /**
* Adds an article category to the database.
*
* @param category A Category object with all the information needed to add it
@@ -313,57 +166,14 @@
*/
function addArticleCategory( $articleCategory )
{
- $query = "INSERT INTO ".$this->getPrefix()."articles_categories
- (name,url,blog_id,in_main_page,properties,mangled_name,description) VALUES
- ('".Db::qstr($articleCategory->getName()).
- "','".Db::qstr($articleCategory->getURL()).
- "','".Db::qstr($articleCategory->getBlogId()).
- "','".Db::qstr($articleCategory->isInMainPage()).
- "','".Db::qstr(serialize($articleCategory->getProperties())).
- "', '".TextFilter::urlize($articleCategory->getName()).
- "', '".Db::qstr($articleCategory->getDescription()).
- "');";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- // return the id of the last row inserted
- return $this->_db->Insert_ID();
+ if(( $result = $this->add( $articleCategory, Array( CACHE_ARTICLE_CATEGORIES => "getId", CACHE_ARTICLE_CATEGORIES_BYNAME => "getMangledName" )))) {
+ $this->_cache->removeData( $articleCategory->getBlogId(), CACHE_ARTICLE_CATEGORIES_BLOG, $articleCategory );
+ }
+
+ return( $result );
}
/**
- * Returns how many articles have been classified under this category
- *
- * @param categoryId The identifier of that category.
- * @param status The status that posts of that category should have. If none specified,
- * POST_STATUS_PUBLISHED will be used.
- * @param searchTerms
- * @return The number of articles, or 0 if none.
- */
- function getNumArticlesCategory( $categoryId, $status = POST_STATUS_PUBLISHED )
- {
- $prefix = $this->getPrefix();
- $query1 = "SELECT COUNT(*) AS 'count' FROM
- {$prefix}article_categories_link AS l, {$prefix}articles AS a
- WHERE l.article_id = a.id AND l.category_id = '".Db::qstr($categoryId)."'";
- if( $status != POST_STATUS_ALL )
- $query1 .= " AND a.status = '".Db::qstr($status)."'";
-
- $result = $this->Execute( $query1 );
-
- if( !$result )
- return 0;
-
- $row = $result->FetchRow();
- $total = $row["count"];
- if( $total == "" ) $total = 0;
-
- return( $total );
- }
-
- /**
* Removes a category from the database. We should check <b>beforehand</b> that such category
* does not have any article classified under it, since then we would have problems
* with the database.
@@ -374,15 +184,11 @@
*/
function deleteCategory( $categoryId, $blogId )
{
- $query = "DELETE FROM ".$this->getPrefix()."articles_categories
- WHERE id = ".Db::qstr($categoryId)." AND blog_id = ".$blogId;
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
- else
- return true;
+ $category = $this->getCategory( $categoryId, $blogId );
+ if( $category )
+ return( $this->delete( "id", $categoryId ));
+ else
+ return( false );
}
/**
@@ -392,19 +198,15 @@
*/
function deleteBlogCategories( $blogId )
{
- // first delete all article category links
- $query = "DELETE FROM ".$this->getPrefix()."article_categories_link
- WHERE category_id IN
- (SELECT id FROM ".$this->getPrefix()."articles_categories
- WHERE blog_id = $blogId)";
- $this->Execute( $query );
-
- $query = "DELETE FROM ".$this->getPrefix()."articles_categories
- WHERE blog_id = $blogId";
-
- $result = $this->Execute( $query );
-
- return $result;
+ if(($result = $this->delete( "blog_id", $blogId ))) {
+ $this->_cache->removeData( "all", CACHE_ARTICLE_CATEGORIES_BLOG );
+ /**
+ * :TODO:
+ * remove each single cached category!
+ */
+ }
+
+ return( $result );
}
/**
@@ -416,21 +218,13 @@
*/
function updateCategory( $category )
{
- $query = "UPDATE ".$this->getPrefix()."articles_categories
- SET name = '".Db::qstr($category->getName())."',
- url = '".Db::qstr($category->getUrl())."',
- in_main_page = ".$category->isInMainPage().",
- properties = '".Db::qstr(serialize($category->getProperties()))."',
- mangled_name = '".Db::qstr(TextFilter::urlize($category->getName()))."',
- description = '".Db::qstr($category->getDescription())."'
- WHERE id = ".$category->getId().";";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
- else
- return true;
+ if( $result = $this->update( $category )) {
+ $this->_cache->removeData( $category->getBlogId(), CACHE_ARTICLE_CATEGORIES_BLOG );
+ $this->_cache->setData( $category->getId(), CACHE_ARTICLE_CATEGORIES, $category );
+ $this->_cache->setData( $category->getMangledName(), CACHE_ARTICLE_CATEGORIES_BYNAME, $category );
+ }
+
+ return( $result );
}
@@ -444,81 +238,30 @@
*/
function getArticleCategories( $articleId, $blogId = -1 )
{
- $prefix = $this->getPrefix();
- $query = "SELECT c.id AS id, c.name AS name, c.url AS url, c.blog_id AS blog_id,
- c.last_modification AS last_modification, c.in_main_page AS in_main_page,
- c.parent_id AS parent_id, c.properties AS properties, c.description AS description,
- c.mangled_name AS mangled_name, IF(a.id IS NULL, 0, COUNT(*)) AS num_articles, a.date AS last_update
- FROM {$prefix}articles_categories c LEFT JOIN {$prefix}article_categories_link l
- ON c.id=l.category_id LEFT JOIN {$prefix}articles a ON a.id = l.article_id
- WHERE a.id = $articleId ";
- if( $blogId > -1 ) {
- $query .= " AND a.blog_id = '".Db::qstr($blogId)."' AND c.blog_id = '".Db::qstr($blogId)."'";
- }
-
- $query .= " GROUP BY c.id";
-
- $result = $this->Execute( $query );
+ $categoryLinks = $this->_cache->getData( $articleId, CACHE_ARTICLE_CATEGORIES_LINK );
+ if( !$categoryLinks ) {
+ $query = "SELECT category_id FROM ".$this->getPrefix()."article_categories_link
+ WHERE article_id = '".Db::qstr( $articleId )."'";
+ if(( $result = $this->Execute( $query ))) {
+ $categoryLinks = Array();
+ while( $row = $result->FetchRow()) {
+ $categoryLinks[] = $row["category_id"];
+ }
+ $this->_cache->setData( $articleId, CACHE_ARTICLE_CATEGORIES_LINK, $categoryLinks );
+ }
+ else
+ return( Array());
+ }
- // it's impossible that an article has no categories, but
- // we'll bear with it...
- if( !$result )
- return Array();
-
- // otherwise, fetch them
- $categories = Array();
- while( $row = $result->FetchRow()) {
- $category = $this->_fillCategoryInformation( $row );
- array_push( $categories, $category );
- }
-
+ foreach( $categoryLinks as $categoryLink ) {
+ $category = $this->getCategory( $categoryLink );
+ if( $category )
+ $categories[] = $category;
+ }
return $categories;
}
/**
- * returns all the article categories given an array of category ids
- *
- * @param articleIds an array of category ids
- * @param blogId The blog id to which these article categories belong. It is recommeded to pass this
- * parameter as it will greatly speed up the query.
- * @return an array of ArticleCategory objects
- */
- function getArticleCategoriesByIds( $articleIds, $blogId = -1 )
- {
-
- $prefix = $this->getPrefix();
- $query = "SELECT a.id as article_id, c.id AS id, c.name AS name, c.url AS url, c.blog_id AS blog_id,
- c.last_modification AS last_modification, c.in_main_page AS in_main_page,
- c.parent_id AS parent_id, c.properties AS properties, c.description AS description,
- c.mangled_name AS mangled_name, IF(a.id IS NULL, 0, COUNT(*)) AS num_articles, a.date AS last_update
- FROM {$prefix}articles_categories c LEFT JOIN {$prefix}article_categories_link l
- ON c.id=l.category_id LEFT JOIN {$prefix}articles a ON a.id = l.article_id
- WHERE a.id IN (".$articleIds.") ";
- if( $blogId > -1 ) {
- $query .= " AND a.blog_id = '".Db::qstr( $blogId )."' AND c.blog_id = '".Db::qstr( $blogId )."'";
- }
-
- $query .= " GROUP BY c.id, a.id";
-
- $result = $this->Execute( $query );
-
- // it's impossible that an article has no categories, but
- // we'll bear with it...
- if( !$result )
- return Array();
-
- // otherwise, fetch them
- while ($row = $result->FetchRow()) {
- $lastArticleId=$row["article_id"];
- $category = $this->_fillCategoryInformation( $row );
- $categories[$lastArticleId][]=$category;
- }
-
-
- return $categories;
- }
-
- /**
* returns how many categories a blog has
*
* @param blogId
@@ -528,23 +271,7 @@
*/
function getBlogNumCategories( $blogId, $includeHidden = false, $searchTerms = "" )
{
- // table name
- $prefix = $this->getPrefix();
- $table = "{$prefix}articles_categories";
-
- // conditions
- $cond1 = "blog_id = '".Db::qstr($blogId)."'";
- if( $includeHidden )
- $cond2 = "in_main_page = 1";
- if( $searchTerms != "" )
- $cond3 = $this->buildSearchCondition( $searchTerms );
-
- $cond = " ".$this->buildWhereCondition( Array( $cond1, $cond2, $cond3 ), false );
-
- // return the total number
- $total = $this->getNumItems( $table, $cond );
-
- return( $total );
+ return(count($this->getBlogCategories( $blogId, !$includeHidden, BLOG_CATEGORIES_DEFAULT_ORDER, $searchTerms )));
}
}
-?>
+?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/articlecategory.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/articlecategory.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/articlecategory.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -28,6 +28,7 @@
include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$this->DbObject();
+
$this->_name = $name;
$this->_url = $url;
$this->_id = $id;
@@ -39,7 +40,21 @@
$this->_description = $description;
$this->_lastModification = new Timestamp($lastModification);
$this->_articles = Array();
- $this->_numArticles = Array();
+ $this->_numArticles = 0;
+ $this->_numPublishedArticles = 0;
+
+ $this->_pk = "id";
+ $this->_fields = Array( "name" => "getName",
+ "url" => "getUrl",
+ "blog_id" => "getBlogId",
+ "parent_id" => "getParentId",
+ "description" => "getDescription",
+ "in_main_page" => "isInMainPage",
+ "last_modification" => "getLastModification",
+ "properties" => "getProperties",
+ "num_articles" => "getNumAllArticles",
+ "num_published_articles" => "getNumPublishedArticles",
+ "mangled_name" => "getMangledName" );
}
/**
@@ -150,16 +165,19 @@
*/
function getNumArticles( $status = POST_STATUS_PUBLISHED )
{
- $origStatus = $status;
- if( $status == POST_STATUS_ALL )
- $status = 0;
-
- if( !is_array( $this->_numArticles[$status] ) || $this->_numArticles[$status] == null ) {
- $categories = new ArticleCategories();
- $this->_numArticles[$status] = $categories->getNumArticlesCategory( $this->getId(), $origStatus );
- }
+ if( $status == POST_STATUS_ALL )
+ return( $this->_numArticles );
+ elseif( $status == POST_STATUS_PUBLISHED )
+ return( $this->_numPublishedArticles );
+ else {
+ $origStatus = $status;
+ if( !is_array( $this->_numArticles[$status] ) || $this->_numArticles[$status] == null ) {
+ $categories = new ArticleCategories();
+ $this->_numArticles[$status] = $categories->getNumArticlesCategory( $this->getId(), $origStatus );
+ }
- return( $this->_numArticles[$status] );
+ return( $this->_numArticles[$status] );
+ }
}
/**
@@ -173,6 +191,21 @@
return( $this->getNumArticles( POST_STATUS_ALL ));
}
+ function getNumPublishedArticles()
+ {
+ return( $this->_numPublishedArticles );
+ }
+
+ function setNumPublishedArticles( $num )
+ {
+ $this->_numPublishedArticles = $num;
+ }
+
+ function setNumArticles( $num )
+ {
+ $this->_numArticles = $num;
+ }
+
/**
* returns the articles categorized here
*
@@ -264,7 +297,12 @@
function setLastModification( $newDate )
{
$this->_lastModification = $newDate;
- }
+ }
+ function getMangledName()
+ {
+ include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+ return( Textfilter::urlize( $this->getName()));
+ }
}
-?>
+?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/articlecomments.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/articlecomments.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/articlecomments.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -32,16 +32,6 @@
return( CommentsCommon::getPostComments( $artid, $order, $status, COMMENT_TYPE_COMMENT, $page, $itemsPerPage ));
}
- /**
- * Retrieves all the comments for subquery of posts
- *
- * @private
- */
- function getPostCommentsByIds( $ids, $order = COMMENT_ORDER_NEWEST_FIRST, $status = COMMENT_STATUS_ALL )
- {
- return( CommentsCommon::getPostCommentsByIds( $ids, $order, $status, COMMENT_TYPE_COMMENT ));
- }
-
/**
* Returns the total number of comments for a post
*
@@ -60,7 +50,7 @@
*/
function getPostComment( $artid, $commentid )
{
- return( CommentsCommon::getPostComment( $artid, $commentid, COMMENT_TYPE_COMMENT ));
+ return( CommentsCommon::getPostComment( $commentid, $artid, COMMENT_TYPE_COMMENT ));
}
/**
@@ -105,16 +95,6 @@
}
/**
- * Removes all the comments from a post.
- *
- * @param artId The article identifier
- */
- function deletePostComments( $artId )
- {
- return( CommentsCommon::deletePostComments( $artId, COMMENT_TYPE_COMMENT ));
- }
-
- /**
* updates the status of a comment, regarding its spam status...
*
* @param commentId
Modified: plog/branches/plog-1.1-daochanges/class/dao/articlenotifications.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/articlenotifications.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/articlenotifications.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -183,6 +183,8 @@
return $result;
}
+
+
/**
* Sends a weblogsUpdate.ping xmlrpc call to notifiy of changes in this blog
*
* @param blogInfo The BlogInfo object containing information about the blog
* @return Returns true if successful or false otherwise.
*/
function updateNotify( $blogInfo )
{
// source classes
include_once( PLOG_CLASS_PATH."class/net/xmlrpcclient.class.php" );
require_once( PLOG_CLASS_PATH . 'class/config/config.class.php' );
// if this feature is not enabled, we quit
$config =& Config::getConfig();
if( !$config->getValue( "xmlrpc_ping_enabled" ))
return;
// get the array which contains the hosts
$hosts = $config->getValue( "xmlrpc_ping_hosts" );
// if it is not an array, quit
if( !is_array($hosts))
return;
// if no hosts, we can quit too
if( empty($hosts))
return;
// otherwise, we continue
$xmlrpcPingResult = Array();
$rg = $blogInfo->getBlogRequestGenerator();
$blogLink = $rg->blogLink();
foreach( $hosts as $host ) {
$client = new XmlRpcClient( $host );
$result = $client->ping( $blogInfo->getBlog(), $blogLink);
//print("result = ".$result. "is Error = ".$client->isError()." message: ".$client->getErrorMessage()."<br/>");
//$xmlrpcPingResult[$result["host"]
$xmlrpcPingResult=array_merge($xmlrpcPingResult, $result);
}
return $xmlrpcPingResult;
}
/**
* Returns the notifications but only for a particular user, a particular blog and
Modified: plog/branches/plog-1.1-daochanges/class/dao/articles.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/articles.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/articles.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -4,6 +4,16 @@
include_once( PLOG_CLASS_PATH.'class/dao/article.class.php' );
include_once( PLOG_CLASS_PATH.'class/dao/articlestatus.class.php' );
include_once( PLOG_CLASS_PATH.'class/config/config.class.php' );
+
+ /**
+ * cache ids used by this class
+ */
+ define( "CACHE_ARTICLES", "articles" );
+ define( "CACHE_ARTICLES_BYNAME", "articles_byname" );
+ define( "CACHE_ARTICLETEXT", "article_text" );
+ define( "CACHE_ARTICLES_BYBLOG", "articles_byblog" );
+ define( "CACHE_ARTICLESPERMONTH", "articles_per_month" );
+
/**
* \ingroup DAO
*
@@ -11,24 +21,12 @@
*/
class Articles extends Model
{
- // DAO objects that we keep for later, so that we don't have
- // to create them eeeeevery time!
- var $categories = null;
- var $comments = null;
- var $trackbacks = null;
- var $users = null;
- var $blogs = null;
- var $customfields = null;
- var $_blogInfo = null;
- var $_blogSettings = null;
- var $_timeDiff = null;
-
function Articles()
{
$this->Model();
- $this->_blogInfo = null;
- $this->_timeDiff = 0;
- $this->_blogsettings = null;
+
+ $this->table = $this->getPrefix()."articles";
+ $this->pk = "id";
}
/**
@@ -40,29 +38,7 @@
*/
function getArticle( $articleId )
{
- $article = $this->_cache->getData( $articleId, CACHE_ARTICLES );
-
- if ( !$article ) {
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
-
- $query = Db::buildSelectQuery( ARTICLES_TABLENAME,
- array(),
- 'id',
- $articleId );
-
- // we send the query and then fetch the first array with the result
- $result = $this->Execute( $query );
-
- if ( $result->RecordCount() == 0 )
- return false;
-
- $article = $this->_fillArticleInformation( $result->FetchRow( $result ) );
-
- $article->getFields();
-
- $this->_cache->setData( $article->getId(), CACHE_ARTICLES, $article );
- }
- return $article;
+ return( $this->get( "id", $articleId, CACHE_ARTICLES ));
}
/**
@@ -73,38 +49,11 @@
*/
function getArticles( $blogId )
{
- require_once( PLOG_CLASS_PATH . 'class/dao/blogarticles.class.php' );
-
- $blogArticles = $this->_cache->getData( $blogId, CACHE_BLOGARTICLES );
-
- if( !$blogArticles ) {
- require_once( PLOG_CLASS_PATH . 'class/database/db.class.php' );
-
- $prefix = $this->getPrefix();
-
- // as much as i would like to, i don't know how to use a less complicated
- // sql statement or how to use an abstract method to build an statement
- // like this one.
- $query = "SELECT a.id as id, c.category_id as category_id, a.date as date,
- a.status as status, a.user_id as user_id
- FROM {$prefix}article_categories_link c LEFT JOIN {$prefix}articles a
- ON a.id = c.article_id
- WHERE a.blog_id = $blogId
- ORDER BY a.date DESC";
-
- $result = $this->Execute( $query );
-
- $rows = array();
- while( $row = $result->FetchRow($result) ) {
- $rows[] = $row;
- }
-
- $blogArticles = new BlogArticles( $blogId, $rows );
-
- $this->_cache->setData( $blogId, CACHE_BLOGARTICLES, $blogArticles );
- }
-
- return $blogArticles;
+ $blogArticles = $this->getMany( "blog_id",
+ $blogId,
+ CACHE_ARTICLES_BYBLOG,
+ Array( CACHE_ARTICLES => "getId" ));
+ return( $blogArticles );
}
/**
@@ -117,19 +66,13 @@
*/
function getUserArticle( $artId, $userId = -1 )
{
- $article = $this->getArticle( $artId );
- if( !$article )
- return false;
-
- if ( $userId != -1 ) {
- $article = $this->getArticle( $artId );
- $articleOwner = $article->getUser();
-
- if( $articleOwner->getId() != $userId ) {
- return false;
- }
- }
- return $article;
+ $article = $this->getArticle( $artId );
+ if( !$article )
+ return false;
+ if( $userId > -1 && $article->getOwnerId() != $userId )
+ return false;
+
+ return( $article );
}
/**
@@ -139,7 +82,14 @@
* @param blogId If set, the article must belong to the given blog
* @return Returns an Article object or 'false' otherwise.
*/
- function getBlogArticle( $artId, $blogId = -1 )
+ function getBlogArticle( $artId,
+ $blogId = -1,
+ $includeHiddenFields = true,
+ $date = -1,
+ $categoryId = -1,
+ $userId = -1,
+ $status = POST_STATUS_PUBLISHED )
+
{
$article = $this->getArticle( $artId );
@@ -147,12 +97,18 @@
return false;
if( $blogId != -1 ) {
- $article = $this->getArticle( $artId );
-
if( $article->getBlogId() != $blogId ) {
return false;
}
}
+ if( $userId != -1 ) {
+ if( $article->getUserId() != $userId ) {
+ return false;
+ }
+ }
+ if( $article->getStatus() != $status )
+ return false;
+
return $article;
}
@@ -259,7 +215,7 @@
$row = $result->FetchRow( $result );
- $article = $this->_fillArticleInformation( $row, $includeHiddenFields );
+ $article = $this->mapRow( $row, $includeHiddenFields );
return $article;
}
@@ -362,6 +318,40 @@
return count($articles);
}
+
+ /**
+ * @private
+ * returns true whether the given article matches the given conditions, or false otherwise
+ */
+ function check( $article,
+ $date = -1,
+ $categoryId = 0,
+ $status = POST_STATUS_PUBLISHED,
+ $userId = 0,
+ $maxDate = 0,
+ $searchTerms = "" )
+ {
+ if( $status != POST_STATUS_PUBLISHED ) {
+ if( $article->getStatus() != $status )
+ return false;
+ }
+ if( $categoryId > 0 ) {
+ $found = false;
+ foreach( $article->getCategoryIds() as $catId ) {
+ if( $categoryId == $catId ) {
+ $found = true;
+ }
+ }
+ if( !$found )
+ return false;
+ }
+ if( $userId > 0 ) {
+ if( $article->getUserId() != $userId )
+ return false;
+ }
+
+ return( true );
+ }
/**
* Returns all the articles for a given blog, according to the conditions specified in
@@ -392,39 +382,22 @@
$searchTerms = "",
$page = -1 )
{
- $blogArticles = $this->getArticles( $blogId );
- $requestedArticles = $blogArticles->getArticleIdsByStatus( $status );
-
- if( $categoryId > 0 )
- $requestedArticles = $blogArticles->getArticleIdsByCategory( $categoryId,
- $requestedArticles );
- if( $userId > 0 )
- $requestedArticles = $blogArticles->getArticleIdsByUserId( $userId,
- $requestedArticles );
- if( $date != -1 )
- $requestedArticles = $blogArticles->getArticleIdsByDate( $date,
- $requestedArticles );
-
- if( $maxDate != 0 )
- $requestedArticles = $blogArticles->getArticleIdsBefore( $maxDate,
- $requestedArticles );
-
- if( $searchTerms != '' )
- $requestedArticles = $this->searchArticles( $searchTerms, $requestedArticles );
-
- if( ($amount > 0) && ($date == -1) && ($page == -1 ) )
- $requestedArticles = array_slice( $requestedArticles, 0, $amount );
-
- if( $page > 0 ) {
- $start = (($page - 1) * $amount);
- $requestedArticles = array_slice( $requestedArticles, $start, $amount );
- }
-
- $articles = array();
- foreach( $requestedArticles as $article ) {
- $articles[] = $this->getArticle( $article );
- }
- return $articles;
+ include_once( PLOG_CLASS_PATH."class/dao/blogarticles.class.php" );
+ $articles = $this->getArticles( $blogId );
+
+ $result = Array();
+ $add = false;
+ $total = 0;
+ foreach( $articles as $article ) {
+ if( $this->check( $article )) {
+ $result[] = $article;
+ $total++;
+ }
+ if( $total >= $amount )
+ break;
+ }
+
+ return( $result );
}
/**
@@ -443,7 +416,8 @@
if( !$archives ) {
require_once( PLOG_CLASS_PATH . 'class/dao/blogs.class.php' );
$blogs = new Blogs();
- $blogSettings = $blogs->getBlogSettings( $blogId );
+ $blogInfo = $blogs->getBlogInfo( $blogId );
+ $blogSettings = $blogInfo->getSettings();
if( $blogSettings->getValue("show_future_posts_in_calendar") )
$numPostsPerMonthQuery = "SELECT COUNT(*) AS 'count',
@@ -529,7 +503,9 @@
// another long sql query :) the id and date fields are there just in case we need to debug
// but they're not included in the resulting array
$blogs = new Blogs();
- $blogSettings = $blogs->getBlogSettings( $blogId );
+ $blogInfo = $blogs->getBlogInfo( $blogId );
+ $blogSettings = $blogInfo->getSettings();
+
// check whether we're supposed to show posts that happen in the future or not
if( $blogSettings->getValue( "show_future_posts_in_calendar" ))
$numPostsPerDayQuery = "SELECT COUNT(*) AS 'count', DAYOFMONTH(date) AS 'day', id AS 'id', date AS 'date' FROM ".$this->getPrefix()."articles WHERE status = 1 AND blog_id = ".$blogId." AND MONTH(date) = ".$month." AND YEAR(date) = ".$year." GROUP BY DAYOFMONTH(date);";
@@ -557,14 +533,19 @@
* @param categories
* @return True
*/
- function addPostCategoriesLink( $articleId, $categories )
- {
+ function addPostCategoriesLink( $article )
+ {
require_once( PLOG_CLASS_PATH.'class/database/db.class.php' );
+ require_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
+ $articleId = $article->getId();
+ $categories = $article->getCategoryIds();
// nothing to do if the $categories array is not ehem, an array :)
if( !is_array( $categories ))
return true;
+ $articleCategories = new ArticleCategories();
foreach( $categories as $categoryId ) {
$keyValuePairs = array();
$keyValuePairs['article_id'] = $articleId;
@@ -573,6 +554,13 @@
$query = Db::buildInsertQuery( ARTICLE_CATEGORIES_RELATIONSHIP_TABLENAME,
$keyValuePairs );
$this->Execute( $query );
+
+ $category = $articleCategories->getCategory( $categoryId );
+ if( $article->getStatus() == POST_STATUS_PUBLISHED ) {
+ $category->setNumPublishedArticles( $category->getNumPublishedArticles() +1 );
+ }
+ $category->setNumArticles( $category->getNumAllArticles() + 1 );
+ $articleCategories->updateCategory( $category );
}
return true;
@@ -582,15 +570,29 @@
* removes the relationship between posts and categories from the database. This
* method should only be used when removing an article!!
*/
- function deletePostCategoriesLink( $articleId )
+ function deletePostCategoriesLink( $article )
{
require_once( PLOG_CLASS_PATH.'class/database/db.class.php' );
+ require_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+ $articleId = $article->getId();
$query = Db::buildDeleteQuery( ARTICLE_CATEGORIES_RELATIONSHIP_TABLENAME,
'article_id',
$articleId );
- return $this->Execute( $query );
+ if( ( $result = $this->Execute( $query ))) {
+ // updated the category counters
+ $articleCategories = new ArticleCategories();
+ foreach( $article->getCategories() as $category ) {
+ $category->setNumArticles( $category->getNumArticles() - 1 );
+ if( $article->getStatus() == POST_STATUS_PUBLISHED ) {
+ $category->setNumPublishedArticles( $category->getNumPublishedArticles() - 1 );
+ }
+ $articleCategories->updateCategory( $category );
+ }
+ }
+
+ return( $result );
}
/**
@@ -598,12 +600,12 @@
* (basically, we use brute force here: first remove them and then recreate them again...
* It takes less time than going through all of them and checking if they exist or not.
*/
- function updatePostCategoriesLink( $articleId, $categories )
+ function updatePostCategoriesLink( $article )
{
- if( !$this->deletePostCategoriesLink( $articleId ))
+ if( !$this->deletePostCategoriesLink( $article ))
return false;
- return $this->addPostCategoriesLink( $articleId, $categories );
+ return $this->addPostCategoriesLink( $article );
}
/**
@@ -616,44 +618,40 @@
function addArticle( &$newArticle )
{
include_once( PLOG_CLASS_PATH.'class/dao/customfields/customfields.class.php' );
- require_once( PLOG_CLASS_PATH.'class/database/db.class.php' );
+ include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+ $result = $this->add( $newArticle );
+
+ if( !$result )
+ return false;
- $valuesToInsert = array();
-
- $valuesToInsert['user_id'] = $newArticle->getUser();
- $valuesToInsert['blog_id'] = $newArticle->getBlogId();
- $valuesToInsert['status'] = $newArticle->getStatus();
- $valuesToInsert['date'] = $newArticle->getDate();
- $valuesToInsert['properties'] = serialize( $newArticle->getProperties() );
- $valuesToInsert['slug'] = $newArticle->getPostSlug();
-
- $query = Db::buildInsertQuery( ARTICLES_TABLENAME,
- $valuesToInsert );
-
- $result = $this->Execute( $query );
-
- if( !$result ){
- return false;
- }
-
- // get id of the post from the database
- $postId = $this->_db->Insert_ID();
-
- // save the post text
- $newArticle->setId( $postId );
$this->addArticleText( $newArticle );
- // and create the link between the post and its categoriesç
- $this->addPostCategoriesLink( $postId, $newArticle->getCategoryIds());
+ // and create the link between the post and its categories
+ $this->addPostCategoriesLink( $newArticle );
// and save the custom fields
- $this->addArticleCustomFields( $postId, $newArticle->getBlog(), $newArticle->getFields());
+ $customFields = new CustomFieldsValues();
+ foreach( $fields as $field ) {
+ $customFields->addCustomFieldValue( $field->getFieldId(),
+ $field->getValue(),
+ $artId,
+ $blogId );
+ }
+
+ // update the blog counters
+ if( $newArticle->getStatus() == POST_STATUS_PUBLISHED ) {
+ $blogs = new Blogs();
+ $blogInfo = $newArticle->getBlogInfo();
+ $blogInfo->setTotalPosts( $blogInfo->getTotalPosts() + 1 );
+ $blogs->updateBlog( $blogInfo );
+ }
// and finally clear the cache :)
- $this->_cache->removeData( $newArticle->getBlogId(), CACHE_BLOGARTICLES );
+ $this->_cache->removeData( $newArticle->getBlogId(), CACHE_ARTICLES_BYBLOG );
$this->_cache->removeData( $newArticle->getBlogId(), CACHE_ARTICLESPERMONTH );
- return $postId;
+ return( $newArticle->getId());
}
/**
@@ -738,28 +736,8 @@
return($this->Execute( $query ));
}
-
+
/**
- * Saves the custom fields of an article
- *
- * @param artId
- * @param blogId
- * @param fields
- * @return True if successful or false otherwise
- */
- function addArticleCustomFields( $artId, $blogId, $fields )
- {
- $customFields = new CustomFieldsValues();
-
- foreach( $fields as $field ) {
- $customFields->addCustomFieldValue( $field->getFieldId(), $field->getValue(),
- $artId, $blogId );
- }
-
- return true;
- }
-
- /**
* Updates an article in the database
*
* @param article The Article object that we'd like to update in the database.
@@ -767,29 +745,8 @@
*/
function updateArticle( $article )
{
- include_once( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
- include_once( PLOG_CLASS_PATH.'class/database/db.class.php' );
+ $result = $this->update( $article );
- // we have to build up the query, which will be pretty long...
- $articleDate = Timestamp::getDateWithOffset( $article->getDate(), -($article->getTimeOffset()));
- $filter = new Textfilter();
-
- $keyValuePairs = array();
- $keyValuePairs['user_id'] = $article->getUser();
- $keyValuePairs['date'] = $articleDate;
- $keyValuePairs['blog_id'] = $article->getBlogId();
- $keyValuePairs['status'] = $article->getStatus();
- $keyValuePairs['num_reads'] = $article->getNumReads();
- $keyValuePairs['properties'] = serialize( $article->getProperties() );
- $keyValuePairs['slug'] = $article->getPostSlug();
-
- $query = Db::buildUpdateQuery( ARTICLES_TABLENAME,
- $keyValuePairs,
- 'id',
- $article->getId() );
-
- $result = $this->Execute( $query );
-
// we don't bother doing anything else if the query above failed...
if( !$result )
return false;
@@ -797,7 +754,7 @@
// update the article text
$this->updateArticleText( $article );
- if( !$this->updatePostCategoriesLink( $article->getId(), $article->getCategoryIds()) ||
+ if( !$this->updatePostCategoriesLink( $article ) ||
!$this->updateArticleCustomFields( $article->getId(), $article->getBlog(),
$article->getFields()) )
return false;
@@ -805,6 +762,7 @@
// clean up the cache
$this->_cache->removeData( $article->getBlogId(), CACHE_ARTICLESPERMONTH );
$this->_cache->removeData( $article->getId(), CACHE_ARTICLES );
+ $this->_cache->removeData( $article->getBlogId(), CACHE_ARTICLES_BYBLOG );
return true;
}
@@ -915,48 +873,51 @@
include_once( PLOG_CLASS_PATH.'class/dao/articlecomments.class.php' );
include_once( PLOG_CLASS_PATH.'class/database/db.class.php' );
include_once( PLOG_CLASS_PATH.'class/dao/trackbacks.class.php' );
- include_once( PLOG_CLASS_PATH.'class/dao/customfields/customfieldsvalues.class.php' );
+ include_once( PLOG_CLASS_PATH.'class/dao/customfields/customfieldsvalues.class.php' );
+
+ $article = $this->getBlogArticle( $artId, $blogId, true, -1, -1, $userId );
+ if( !$article )
+ return false;
if( $forever ) {
- $query = "DELETE FROM ".$this->getPrefix()."articles WHERE id = ".$artId." AND user_id = ".$userId." AND blog_id = ".$blogId.";";
+ if( !$this->delete( $artId ))
+ return false;
+
// -- text --
$this->deleteArticleText( $artId );
// we also have to remove its comments and trackbacks if the article is being deleted forever
// -- comments --
- $comments = new ArticleComments();
- $comments->deletePostComments( $artId );
+ $articleComments = new ArticleComments();
+ foreach( $article->getComments() as $comment )
+ $comments->deletePostComment( $artId, $comment->getId());
+
// -- trackbacks --
- $trackbacks = new Trackbacks();
- $trackbacks->deletePostTrackbacks( $artId );
+ foreach( $article->getTrackbacks() as $trackback )
+ $comments->deleteTrackback( $artId, $trackback->getId());
+
// -- post-to-categories mappings --
- $this->deletePostCategoriesLink( $artId );
+ $this->deletePostCategoriesLink( $article );
// -- custom fields --
$customFields = new CustomFieldsValues();
$customFields->removeArticleCustomFields( $artId );
+
+ $this->_cache->removeData( $blogId, CACHE_ARTICLES_BYBLOG );
+ $this->_cache->removeData( $blogId, CACHE_ARTICLESPERMONTH );
+ $this->_cache->removeData( $artId, CACHE_ARTICLES );
}
else {
- $keyValuePairs = array();
- $keyValuePairs['date'] = '@date';
- $keyValuePairs['status'] = POST_STATUS_DELETED;
-
- $query = Db::buildUpdateQuery( ARTICLES_TABLENAME,
- $keyValuePairs,
- 'id',
- $artId );
+ $article->setStatus( POST_STATUS_DELETED );
+ $this->updateArticle( $article );
}
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- if( $this->_db->Affected_Rows() == 0 )
- return false;
-
- $this->_cache->removeData( $blogId, CACHE_BLOGARTICLES );
- $this->_cache->removeData( $blogId, CACHE_ARTICLESPERMONTH );
- $this->_cache->removeData( $artId, CACHE_ARTICLES );
-
+ // update the blog counters
+ if( $article->getStatus() == POST_STATUS_PUBLISHED ) {
+ $blogs = new Blogs();
+ $blogInfo = $article->getBlogInfo();
+ $blogInfo->setTotalArticles( $blogInfo->getTotalArticles() + 1 );
+ $blogs->updateBlog( $blogInfo );
+ }
+
return true;
}
@@ -978,56 +939,6 @@
}
/**
- * returns true if the user posted this article/post, or false
- * if he or she doesn't own it
- *
- * @param userInfo A UserInfo object with information about the user
- * @param artId A valid article identifier
- * @return Returns true if the article is owned by the user or false otherwise.
- */
- function doesUserOwnArticle( $userinfo, $artid )
- {
- $article = $this->getArticle( $artid );
- $articleOwnerInfo = $article->getUserInfo();
-
- if( $articleOwnerInfo->getId() == $userinfo->getId())
- return true;
- else
- return false;
- }
-
- /**
- * Returns all the posts in the database or the 'maxPosts' recent ones that have been
- * published (status=='published')
- *
- * @param maxPosts The amount of post we want.
- * @return Returns an array of Article objects containing the information about the posts.
- */
- function getAllArticles( $maxPosts = 0, $date = 0)
- {
- $query = "SELECT * FROM ".$this->getPrefix()."articles WHERE status = 1";
- if( $date > 0 )
- $query .= " AND date < '$date'";
-
- $query .= " ORDER BY date DESC";
-
- if( $maxPosts > 0 )
- $query .= " LIMIT 0,".$maxPosts;
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- $posts = Array();
- while( $row = $result->FetchRow()) {
- $posts[] = $this->_fillArticleInformation( $row );
- }
-
- return $posts;
- }
-
- /**
* Removes all the posts from the given blog
*
* @param blogId The blog identifier
@@ -1070,42 +981,9 @@
return true;
}
- /**
- * returns all the categories that an article has been assigned to
- */
- function getArticleCategories( $articleId, $blogId = -1 )
+ function mapRow( $query_result )
{
- include_once( PLOG_CLASS_PATH.'class/dao/articlecategories.class.php' );
-
- if( $this->categories === null )
- $this->categories = new ArticleCategories();
-
- return $this->categories->getArticleCategories( $articleId, $blogId );
- }
-
- /**
- * sets a time difference that will be added to each
- * date and time
- *
- * @param timeDiff The time difference. IT should be between +12 and -12
- * @return Always returns true.
- */
- function setTimeDiff( $timeDiff )
- {
- $this->_timeDiff = $timeDiff;
-
- return true;
- }
-
- /**
- * Does exactly the same as _fillUserInformation, so that it can be reused
- * by the different functions that work on articles from the database. This method is
- * private and shouldn't be used outside this class.
- *
- * @private
- */
- function _fillArticleInformation( $query_result, $includeHiddenFields = true )
- {
+ include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
include_once( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
include_once( PLOG_CLASS_PATH.'class/dao/users.class.php' );
include_once( PLOG_CLASS_PATH.'class/dao/blogs.class.php' );
@@ -1120,23 +998,17 @@
$query_result['properties'] = serialize($tmpArray);
}
- //
- // if there's a time difference applied to all dates, then we'd better
- // calculate it here!!
- //
- if( $this->blogs === null )
- $this->blogs = new Blogs();
-
+ $blogs = new Blogs();
$blogId = $query_result['blog_id'];
- $blogInfo = $this->blogs->getBlogInfo( $blogId );
+ $blogInfo = $blogs->getBlogInfo( $blogId );
$blogSettings = $blogInfo->getSettings();
$timeDiff = $blogSettings->getValue( 'time_offset' );
// we can use this auxiliary function to help us...
$date = Timestamp::getDateWithOffset( $query_result['date'], $timeDiff );
- $articleCategories = $this->getArticleCategories( $query_result['id'],
- $query_result['blog_id'] );
+ $categories = new ArticleCategories();
+ $articleCategories = $categories->getArticleCategories( $query_result['id'], $query_result['blog_id'] );
$categoryIds = Array();
foreach( $articleCategories as $category )
array_push( $categoryIds, $category->getId());
@@ -1158,14 +1030,21 @@
// and fill in all the fields with the information we just got from the db
$article->setDate( $date );
$article->setTimeOffset( $timeDiff );
+ $article->setCategories( $articleCategories );
// get information about the categories of the article
- $article->setCategories( $articleCategories );
$article->setBlogInfo( $blogInfo );
if ( $this->users === null )
$this->users = new Users();
- $article->setUserInfo( $this->users->getUserInfoFromId( $query_result['user_id'] ));
+ $article->setUserInfo( $this->users->getUserInfoFromId( $query_result['user_id'] ));
+
+ // counters
+ $article->setTotalComments( $query_result['num_comments'] );
+ $article->setNumComments( $query_result['num_nonspam_comments'] );
+ $article->setNumTrackbacks( $query_result['num_nonspam_trackbacks'] );
+ $article->setTotalTrackbacks( $query_result['num_trackbacks'] );
return $article;
+
}
}
-?>
+?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/blogarticles.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/blogarticles.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/blogarticles.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -31,28 +31,28 @@
* @param blogId The blogId of the links to fetch
* @blogArticlesSqlRows array containing sql row objects of articles
*/
- function BlogArticles( $blogId, $blogArticlesSqlRows )
+ function BlogArticles( $blogId, $blogArticles )
{
$this->_blogId = $blogId;
- foreach( $blogArticlesSqlRows as $articleSqlRow ) {
- $articleId = $articleSqlRow['id'];
- $categoryId = $articleSqlRow['category_id'];
- $userId = $articleSqlRow['user_id'];
- $date = $articleSqlRow['date'];
+ foreach( $blogArticles as $article ) {
+ $articleId = $article->getId();
+ $userId = $article->getUserId();
+ $date = $article->getDate();
$year = substr( $date, 0, 3 );
$month = substr( $date, 4, 5 );
- $status = $articleSqlRow['status'];
+ $status = $article->getStatus();
- $this->_articles[] = $articleId;
- $this->_articlesByCategory[$categoryId][] = $articleId;
- $this->_articlesByDate[$date][] = $articleId;
- $this->_articlesByStatus[$status][] = $articleId;
- $this->_articlesByUser[$userId][] = $articleId;
+ $this->_articles[] = $article;
+ $this->_articlesByCategory[$categoryId][] = $article;
+ $this->_articlesByDate[$date][] = $article;
+ $this->_articlesByStatus[$status][] = $article;
+ $this->_articlesByUser[$userId][] = $article;
$this->_articleStatus[$articleId] = $status;
$this->_articleDate[$articleId] = $date;
- $this->_articleDates[$year][$month][] = $articleId;
- $this->_articleCategories[$articleId][] = $categoryId;
+ $this->_articleDates[$year][$month][] = $article;
+ foreach( $article->getCategoryIds() as $categoryId )
+ $this->_articleCategories[$articleId][] = $categoryId;
}
}
@@ -80,7 +80,7 @@
if( $articleIds == null )
return $this->_articlesByCategory[$categoryId];
- $returnIds = array_intersect( $articleIds, $this->_articlesByCategory[$categoryId] );
+ $returnIds = array_intersect( $articleIds, $this->_articlesByCategory[$categoryId] );
return $returnIds;
}
Modified: plog/branches/plog-1.1-daochanges/class/dao/blogcategories.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/blogcategories.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/blogcategories.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -3,12 +3,16 @@
include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/blogcategory.class.php" );
+ define( "CACHE_BLOGCATEGORIES", "cache_blog_categories" );
+ define( "CACHE_BLOGCATEGORIES_ALL", "cache_blog_categories_all" );
+
class BlogCategories extends Model
{
function BlogCategories()
{
- $this->Model();
+ $this->Model();
+ $this->table = $this->getPrefix()."blog_categories";
}
/**
@@ -19,17 +23,7 @@
*/
function getBlogCategory( $id )
{
- $prefix = $this->getPrefix();
- $query = "SELECT * FROM {$prefix}blog_categories WHERE id = '".Db::qstr( $id )."'";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- $row = $result->FetchRow();
-
- return( $this->_mapRow( $row ));
+ return( $this->get( "id", $id, CACHE_BLOGCATEGORIES ));
}
/**
@@ -41,21 +35,11 @@
*/
function addBlogCategory( &$category )
{
- $prefix = $this->getPrefix();
- $query = "INSERT INTO {$prefix}blog_categories (name, description, properties)
- VALUES ('".Db::qstr($category->getName())."','".Db::qstr($category->getDescription())."','".
- Db::qstr(serialize($category->getProperties()))."')";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
+ if( ($result = $this->add( $category, Array( CACHE_BLOGCATEGORIES => "getId" )))) {
+ $this->_cache->removeData( "all", CACHE_BLOGCATEGORIES_ALL );
+ }
- // get and set the id for the last insertion
- $id = $this->_db->Insert_ID();
- $category->setId( $id );
-
- return( true );
+ return( $result );
}
/**
@@ -68,10 +52,12 @@
*/
function deleteBlogCategory( $id )
{
- $prefix = $this->getPrefix();
- $query = "DELETE FROM {$prefix}blog_categories WHERE id = '".Db::qstr( $id )."'";
+ if( ($result = $this->delete( "id", $id ))) {
+ $this->_cache->removeData( $id, CACHE_BLOGCATEGORIES );
+ $this->_cache->removeData( "all", CACHE_BLOGCATEGORIES_ALL );
+ }
- return( $this->Execute( $query ));
+ return( $result );
}
/**
@@ -82,14 +68,7 @@
*/
function updateBlogCategory( $category )
{
- $prefix = $this->getPrefix();
- $query = "UPDATE {$prefix}blog_categories SET
- name = '".Db::qstr( $category->getName())."',
- description = '".Db::qstr( $category->getDescription())."',
- properties = '".Db::qstr( $category->getProperties())."'
- WHERE id = '".Db::qstr( $category->getId())."'";
-
- return( $this->Execute( $query ));
+ return( $this->update( $category ));
}
/**
@@ -99,18 +78,7 @@
*/
function getNumBlogCategories()
{
- $query = "SELECT COUNT(*) AS total FROM ".$this->getPrefix()."blog_categories";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return 0;
-
- $row = $result->FetchRow();
- if( $row["total"] == "" )
- return( 0 );
- else
- return( $row["total"] );
+ return( $this->getNumItems( $this->table ));
}
/**
@@ -122,21 +90,11 @@
*/
function getBlogCategories( $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
- $prefix = $this->getPrefix();
- $query = "SELECT * FROM {$prefix}blog_categories";
-
- // execute the paged query if necessary
- $result = $this->Execute( $query, $page, $itemsPerPage );
-
- if( !$result )
- return( false );
-
- // if everything ok, loop through the results
- $categories = Array();
- while( $row = $result->FetchRow()) {
- array_push( $categories, $this->_mapRow( $row ));
- }
-
+ $categories = $this->getAll( "all", CACHE_BLOGCATEGORIES_ALL,
+ Array( CACHE_BLOGCATEGORIES => "getId" ),
+ $page,
+ $itemsPerPage );
+
return( $categories );
}
@@ -149,35 +107,27 @@
*/
function getNumBlogsCategory( $categoryId, $status = BLOG_STATUS_ALL )
{
- $prefix = $this->getPrefix();
- $query = "SELECT COUNT(*) AS total
- FROM {$prefix}blogs b
- WHERE b.blog_category_id = '".Db::qstr( $categoryId )."'";
+ $cond = "b.blog_category_id = '".Db::qstr( $categoryId )."'";
if( $status != BLOG_STATUS_ALL )
- $query .= " AND status = '".Db::qstr( $status )."'";
-
- $result = $this->Execute( $query );
+ $cond .= " AND status = '".Db::qstr( $status )."'";
- if( !$result )
- return 0;
-
- $row = $result->FetchRow();
- $total = $row["total"];
- if( $total == "" ) $total = 0;
-
- return( $total );
+ return( $this->getNumItems( $this->getPrefix()."blogs", $cond ));
}
/**
* @private
*/
- function _mapRow( $row )
+ function mapRow( $row )
{
- return( new BlogCategory( $row["name"],
- $row["description"],
- unserialize($row["properties"]),
- $row["id"] ));
+ $category = new BlogCategory( $row["name"],
+ $row["description"],
+ unserialize($row["properties"]),
+ $row["id"] );
+ $category->setNumBlogs( $row["num_blogs"] );
+ $category->setNumActiveBlogs( $row["num_active_blogs"] );
+
+ return( $category );
}
}
?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/blogcategory.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/blogcategory.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/blogcategory.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -24,6 +24,14 @@
$this->_name = $name;
$this->_description = $description;
$this->_properties = $properties;
+
+ $this->_pk = "id";
+ $this->_fields = Array( "id" => "getId",
+ "name" => "getName",
+ "description" => "getDescription",
+ "properties" => "getProperties",
+ "num_blogs" => "getNumBlogs",
+ "num_active_blogs" => "getNumActiveBlogs" );
}
/**
@@ -80,11 +88,31 @@
*/
function getNumBlogs( $status = BLOG_STATUS_ACTIVE )
{
- include_once( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
-
- $categories = new BlogCategories();
- return( $categories->getNumBlogsCategory( $this->getId(), $status ));
+ if( $status == BLOG_STATUS_ALL )
+ return( $this->_numBlogs );
+ elseif( $status == BLOG_STATUS_ACTIVE )
+ return( $this->_numActiveBlogs );
+ else {
+ include_once( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
+ $categories = new BlogCategories();
+ return( $categories->getNumBlogsCategory( $this->getId(), $status ));
+ }
}
+
+ function setNumBlogs( $numBlogs )
+ {
+ $this->_numBlogs = $numBlogs;
+ }
+
+ function getNumActiveBlogs()
+ {
+ return( $this->getNumBlogs( BLOG_STATUS_ACTIVE ));
+ }
+
+ function setNumActiveBlogs( $numActiveBlogs )
+ {
+ $this->_numActiveBlogs = $numActiveBlogs;
+ }
/**
* returns a list with all the blogs that have been categorized under this category
Modified: plog/branches/plog-1.1-daochanges/class/dao/bloginfo.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/bloginfo.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/bloginfo.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -25,11 +25,8 @@
var $_totalPosts;
var $_totalComments;
var $_totalTrackbacks;
- var $_viewedTotal;
var $_ownerInfo;
var $_usersInfo;
- var $_createTimestamp;
- var $_updateTimestamp;
// the TemplateSet representing the template set used by the blog
var $_templateSet;
@@ -46,6 +43,10 @@
function BlogInfo( $blog, $owner, $about, $settings, $id = -1 )
{
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
+ $this->DbObject();
+
$this->setBlog( $blog );
$this->_owner = $owner;
$this->_about = $about;
@@ -58,10 +59,12 @@
$this->_createDate = "";
$this->_updateDate = "";
$this->_totalPosts = 0;
- $this->_viewedTotal = 0;
+ $this->_totalTrackbacks = 0;
+ $this->_totalComments = 0;
$this->_usersInfo = array();
- $this->_createTimestamp = "";
- $this->_updateTimestamp = "";
+ $t = new Timestamp();
+ $this->_createDate = $t->getTimestamp();
+ $this->_updateDate = $t->getTimestamp();
// no template set loaded
$this->_templateSet = null;
@@ -70,15 +73,28 @@
$this->_status = BLOG_STATUS_ACTIVE;
// values that are loaded on demand
- $this->_updateTimestamp = null;
- $this->_viewedTotal = null;
- $this->_totalPosts = null;
- $this->_createTimestamp = null;
$this->_ownerInfo = null;
// information about the blog category id
$this->_category = null;
$this->_categoryId = 0;
+
+ $this->_pk = "id";
+ $this->_fields = Array(
+ "blog" => "getBlog",
+ "owner_id" => "getOwnerId",
+ "about" => "getAbout",
+ "settings" => "getSettings",
+ "mangled_blog" => "getMangledBlogName",
+ "status" => "getStatus",
+ "show_in_summary" => "getShowInSummary",
+ "blog_category_id" => "getBlogCategoryId",
+ "create_date" => "getCreateDate",
+ "last_update_date" => "getUpdateDate",
+ "num_posts" => "getTotalPosts",
+ "num_comments" => "getTotalComments",
+ "num_trackbacks" => "getTotalTrackbacks"
+ );
}
/**
@@ -91,7 +107,6 @@
return $this->_blog;
}
-
/**
* Returns the identifier of the user who owns this journal.
*
@@ -189,93 +204,86 @@
return true;
}
- /**
- * :TODO: I'm not sure anyone ever calls this method, maybe we can
- * get rid of it
- * (2005-05-31 ork at devel.plogworld.net)
- *
- */
- function getCreateDateObject( )
+ /**
+ *
+ */
+ function getCreateDateObject()
{
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
- // if it hasn't been loaded yet...
- if( $this->_createTimestamp === null ) {
- $blogs = new Blogs();
- $this->setCreateDate( $blogs->getBlogCreateDate( $this->getId()));
- }
-
- return $this->_createTimestamp;
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ return( new Timestamp( $this->_createDate ));
}
+
+ function getCreateDate()
+ {
+ return( $this->_createDate );
+ }
+
+ function setCreateDate( $date )
+ {
+ $this->_createDate = $date;
+ }
/**
*/
- function getUpdateDateObject( )
+ function getUpdateDateObject()
{
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
- if( $this->_updateTimestamp === null ) {
- $blogs = new Blogs();
- $this->setUpdateDate( $blogs->getBlogUpdateDate( $this->getId()));
- }
-
- return $this->_updateTimestamp;
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ return( new Timestamp( $this->_updateTimestamp ));
}
+
+ function getUpdateDate()
+ {
+ return( $this->_updateDate );
+ }
+
+ function setUpdateDate( $date )
+ {
+ $this->_updateDate = $date;
+ }
/**
*/
- function getTotalPosts( )
+ function getTotalPosts()
{
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
- if( $this->_totalPosts === null ) {
- $blogs = new Blogs();
- $this->_totalPosts = $blogs->getBlogTotalPosts( $this->getId());
- }
-
return $this->_totalPosts;
}
/**
- */
- function getTotalComments( )
+ * @private
+ */
+ function setTotalPosts( $totalPosts )
{
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ $this->_totalPosts = $totalPosts;
+ }
- if( $this->_totalComments === null ) {
- $blogs = new Blogs();
- $this->_totalComments = $blogs->getBlogTotalComments( $this->getId());
- }
+ /**
+ * @private
+ */
+ function setTotalComments( $totalComments )
+ {
+ $this->_totalComments = $totalComments;
+ }
+ /**
+ */
+ function getTotalComments()
+ {
return $this->_totalComments;
}
-
+
/**
+ * @private
*/
- function getTotalTrackbacks( )
+ function setTotalTrackbacks( $totalTrackbacks )
{
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
- if( $this->_totalTrackbacks === null ) {
- $blogs = new Blogs();
- $this->_totalTrackbacks = $blogs->getBlogTotalTrackbacks( $this->getId());
- }
-
- return $this->_totalTrackbacks;
+ $this->_totalTrackbacks = $totalTrackbacks;
}
/**
*/
- function getViewedTotal( )
+ function getTotalTrackbacks()
{
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
- if( $this->_viewedTotal === null ) {
- $blogs = new Blogs();
- $this->_viewedTotal = $blogs->getBlogViewedTotal( $this->getId());
- }
-
- return $this->_viewedTotal;
+ return $this->_totalTrackbacks;
}
/**
@@ -360,44 +368,6 @@
/**
* @private
*/
- function setCreateDate( $newCreateDate )
- {
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- $this->_createDate = $newCreateDate;
-
- $this->_createTimestamp = new Timestamp( $newCreateDate );
- }
-
- /**
- * @private
- */
- function setUpdateDate( $newUpdateDate )
- {
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- $this->_updateDate = $newUpdateDate;
-
- $this->_updateTimestamp = new Timestamp( $newUpdateDate );
- }
-
- /**
- * @private
- */
- function setTotalPosts( $newTotalPosts )
- {
- $this->_totalPosts = $newTotalPosts;
- }
-
- /**
- * @private
- */
- function setViewedTotal( $newViewedTotal )
- {
- $this->_viewedTotal = $newViewedTotal;
- }
-
- /**
- * @private
- */
function setOwnerInfo( $newOwnerInfo )
{
$this->_ownerInfo = $newOwnerInfo;
@@ -624,5 +594,16 @@
return( $this->_category );
}
+
+ function getMangledBlogName()
+ {
+ include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+ return( Textfilter::urlize( $this->getBlog()));
+ }
+
+ function getShowInSummary()
+ {
+ return( $this->_showInSummary );
+ }
}
?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/blogs.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/blogs.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/blogs.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -5,10 +5,15 @@
/**
* \ingroup DAO
- * Model for the Blogs
+ * DAO class for BlogInfo objects, which represent a blog.
*/
class Blogs extends Model
{
+ function Blogs()
+ {
+ $this->Model();
+ $this->table = $this->getPrefix()."blogs";
+ }
/**
* Returns information about a blog.
@@ -20,23 +25,7 @@
function getBlogInfo( $blogId )
{
require_once( PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php' );
-
- $blogInfo = $this->_cache->getData( $blogId, CACHE_BLOGINFOS );
-
- if( !$blogInfo ) {
- require_once( PLOG_CLASS_PATH."class/database/db.class.php" );
-
- $query = Db::buildSelectQuery( BLOGS_TABLENAME,
- array(),
- 'id',
- $blogId );
- $blogInfo = $this->_getBlogInfoFromQuery( $query, $extendedInfo );
-
- // save the blogInfo object in the cache.
- $this->_cache->setData( $blogId, CACHE_BLOGINFOS, $blogInfo );
- }
-
- return $blogInfo;
+ return( $this->get( "id", $blogId, CACHE_BLOGINFOS, Array( CACHE_BLOGIDBYNAME => "getMangledBlogName" )));
}
/**
@@ -47,310 +36,28 @@
*/
function getBlogInfoByName( $blogName, $extendedInfo = false )
{
- $blogId = $this->_cache->getData( $blogName, CACHE_BLOGIDBYNAME );
-
- if ( !$blogId ) {
- require_once( PLOG_CLASS_PATH."class/database/db.class.php" );
-
- $query = Db::buildSelectQuery( BLOGS_TABLENAME,
- array(),
- 'mangled_blog',
- $blogName );
-
- $blogInfo = $this->_getBlogInfoFromQuery( $query, $extendedInfo );
-
- // and store the blogName-to-blogId relationship in the cache
- $this->_cache->setData( $blogName, CACHE_BLOGIDBYNAME, $blogInfo->getId() );
- } else {
- $blogInfo = $this->getBlogInfo( $blogId );
- }
-
- return $blogInfo;
+ require_once( PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php' );
+ return( $this->get( "mangled_blog", $blogName, CACHE_BLOGIDBYNAME, Array( CACHE_BLOGINFOS => "getId" )));
}
-
/**
- * Retrieves the first article date timestamp
- * :TODO: I'm not sure anyone ever calls this method, maybe we can
- * get rid of it
- * (2005-05-31 ork at devel.plogworld.net)
- *
- * @param blogId The identifier of the blog from which we'd like
- to fetch the creation date
- * @return Returns an Timestamp with the first article date
- */
- function getBlogCreateDate( $blogId )
- {
- require_once( PLOG_CLASS_PATH . 'class/dao/articles.class.php' );
-
- $articles = new Articles();
- $blogArticles = $articles->getArticles( $blogId );
- // these are always sorted by date.
- $allArticles = $blogArticles->getArticleIds();
-
- // there might be no article, we return 01.01.1970 then :-)
- if( empty($allArticles) )
- return '19700101000000';
-
- // fetch the first article
- $article = $articles->getArticle( $allArticles[0] );
-
- return $article->getDate();
- }
-
- /**
- * Retrieves the last article date timestamp
- *
- * @param blogId The identifier of the blog from which we'd like to fetch the settings
- * @return Returns an Timestamp with the last article date
- */
- function getBlogUpdateDate( $blogId )
- {
- require_once( PLOG_CLASS_PATH . 'class/dao/articles.class.php' );
-
- $articles = new Articles();
- $blogArticles = $articles->getArticles( $blogId );
- // these are always sorted by date.
- $allArticles = $blogArticles->getArticleIds();
-
- // there might be no article, we return 01.01.1970 then :-)
- if( empty($allArticles) )
- return '19700101000000';
-
- // fetch the last article
- $article = $articles->getArticle( $allArticles[count($allArticles) - 1] );
-
- return $article->getDate();
- }
-
- /**
- * Retrieves the total number of reads of all articles in that blog
- *
- * @param blogId The identifier of the blog from which we'd like to fetch the settings
- * @return Returns an Timestamp with the last article date
- */
- function getBlogViewedTotal( $blogId )
- {
- $query = "SELECT SUM(num_reads) as total FROM " . $this->getPrefix() .
- "articles WHERE blog_id = " . $blogId;
-
- $result = $this->Execute( $query );
-
- if (!$result)
- return false;
-
- $row = $result->FetchRow();
-
- if (!isset($row["total"]))
- return false;
-
- return $row["total"];
- }
-
- /**
- * Retrieves the total number of posts in a blog
- *
- * @param blogId The identifier of the blog from which we'd like to fetch the settings
- * @return Returns an integer with the number of posts
- */
- function getBlogTotalPosts( $blogId )
- {
- require_once( PLOG_CLASS_PATH . 'class/dao/articlestatus.class.php' );
- require_once( PLOG_CLASS_PATH . 'class/dao/articles.class.php' );
-
- $articles = new Articles();
- $blogArticles = $articles->getArticles( $blogId );
-
- $allArticles = $blogArticles->getArticleIdsByStatus( POST_STATUS_PUBLISHED );
-
- return count($allArticles);
- }
-
- /**
- * Retrieves the total number of comments in a blog
- *
- * @param blogId The identifier of the blog from which we'd like to fetch the settings
- * @return Returns an integer with the number of comments
- */
- function getBlogTotalComments( $blogId )
- {
- $query = "SELECT COUNT(*) as total FROM ".$this->getPrefix()."articles_comments AS c, ".$this->getPrefix()."articles AS a WHERE ((a.blog_id = $blogId) AND (a.id = c.article_id)) AND c.status = ".COMMENT_STATUS_NONSPAM;
- $result = $this->Execute( $query );
-
- if (!$result)
- return false;
-
- $row = $result->FetchRow();
-
- if (!isset($row["total"]))
- return false;
-
- return intval($row["total"]);
- }
-
- /**
- * Retrieves the total number of trackbacks in a blog
- *
- * @param blogId The identifier of the blog from which we'd like to fetch the settings
- * @return Returns an integer with the number of trackbacks
- */
- function getBlogTotalTrackbacks( $blogId )
- {
- $query = "SELECT COUNT(*) as total FROM ".$this->getPrefix()."trackbacks AS t, ".$this->getPrefix()."articles AS a WHERE ((a.blog_id = $blogId) AND (a.id = t.article_id))";
- $result = $this->Execute( $query );
-
- if (!$result)
- return false;
-
- $row = $result->FetchRow();
-
- if (!isset($row["total"]))
- return false;
-
- return intval($row["total"]);
- }
-
- /**
- * Retrieves the blog settings
- *
- * @param settingsField The contents of the blog_settings field from the database
- * @return Returns a BlogSettings object with the settings for the blog
- */
- function getBlogSettingsFromField( $settingsField )
- {
- require_once( PLOG_CLASS_PATH . "class/dao/blogsettings.class.php" );
-
- if( $settingsField == "" || $settingsField == null ) {
- $settings = new BlogSettings();
- }
- else {
- $settings = unserialize( $settingsField );
- if( !is_object($settings) ) {
- // if the BlogSettings object is not valid, return a valid one
- // with some of the default settings, so that at least
- // the blog will keep working!
- $settings = new BlogSettings();
- }
- }
-
- return $settings;
- }
-
- /**
- * Retrieves the blog settings given its id
- *
- * @param blogId The identifier of the blog from which we'd like to fetch the settings
- * @return A BlogSettings object containing the settings, or 'false' if error.
- */
- function getBlogSettings( $blogId )
- {
- $blogInfo = $this->getBlogInfo( $blogId );
-
- return $blogInfo->getSettings();
- }
-
- /**
* Updates the configuration of a blog
*
* @param blogId Blog identifier
* @param blogInfo A BlogInfo object containing all the information of the blog
* @param return Returns true if everything's ok or false otherwise
*/
- function updateBlog( $blogId, $blogInfo )
+ function updateBlog( $blog )
{
- require_once( PLOG_CLASS_PATH . 'class/data/textfilter.class.php' );
- require_once( PLOG_CLASS_PATH . 'class/database/db.class.php' );
+ $result = $this->update( $blog );
+
+ $this->_cache->removeData( $blog->getMangledBlogName(), CACHE_BLOGIDBYNAME );
+ $this->_cache->removeData( $blog->getId(), CACHE_BLOGINFOS );
- $blogName = TextFilter::urlize($blogInfo->getBlog());
-
- // setup an array containing the values we would like to set in the db
- $keyValuePairs = array();
- $keyValuePairs['blog'] = $blogInfo->getBlog();
- $keyValuePairs['about'] = $blogInfo->getAbout();
- $keyValuePairs['settings'] = serialize( $blogInfo->getSettings() );
- $keyValuePairs['owner_id'] = $blogInfo->getOwnerId();
- $keyValuePairs['mangled_blog'] = $blogName;
- $keyValuePairs['status'] = $blogInfo->getStatus();
- $keyValuePairs['blog_category_id'] = $blogInfo->getBlogCategoryId();
-
- $query = Db::buildUpdateQuery( BLOGS_TABLENAME,
- $keyValuePairs,
- 'id',
- $blogId );
- $result = $this->Execute( $query );
-
- $this->_cache->removeData( $blogName, CACHE_BLOGIDBYNAME );
- $this->_cache->removeData( $blogId, CACHE_BLOGINFOS );
-
return $result;
}
- /**
- * Updates the settings of a blog
- *
- * @param blogId The blog we want to update
- * @param blogSettings the BlogSettings object that we would like to update
- * @return 'true' if all correct. 'false' otherwise.
- */
- function updateBlogSettings( $blogId, $blogSettings )
- {
- require_once( PLOG_CLASS_PATH . 'class/database/db.class.php' );
-
- $query = Db::buildUpdateQuery( BLOGS_TABLENAME,
- array( 'settings' => serialize($blogSettings) ),
- 'id',
- $blogId );
- $result = $this->Execute( $query );
-
- $this->_cache->removeData( $blogId, CACHE_BLOGINFOS );
-
- return $result;
- }
-
/**
- * Sends a weblogsUpdate.ping xmlrpc call to notifiy of changes in this blog
- *
- * @param blogInfo The BlogInfo object containing information about the blog
- * @return Returns true if successful or false otherwise.
- */
- function updateNotify( $blogInfo )
- {
- // source classes
- include_once( PLOG_CLASS_PATH."class/net/xmlrpcclient.class.php" );
- require_once( PLOG_CLASS_PATH . 'class/config/config.class.php' );
-
- // if this feature is not enabled, we quit
- $config =& Config::getConfig();
- if( !$config->getValue( "xmlrpc_ping_enabled" ))
- return;
-
- // get the array which contains the hosts
- $hosts = $config->getValue( "xmlrpc_ping_hosts" );
-
- // if it is not an array, quit
- if( !is_array($hosts))
- return;
-
- // if no hosts, we can quit too
- if( empty($hosts))
- return;
-
- // otherwise, we continue
- $xmlrpcPingResult = Array();
- $rg =& RequestGenerator::getRequestGenerator( $blogInfo );
- $blogLink = $rg->blogLink();
- foreach( $hosts as $host ) {
- $client = new XmlRpcClient( $host );
- $result = $client->ping( $blogInfo->getBlog(), $blogLink);
- //print("result = ".$result. "is Error = ".$client->isError()." message: ".$client->getErrorMessage()."<br/>");
- //$xmlrpcPingResult[$result["host"]
- $xmlrpcPingResult=array_merge($xmlrpcPingResult, $result);
- }
-
- return $xmlrpcPingResult;
- }
-
- /**
* Adds a new blog to the database.
*
* @param blog A BlogInfo object with the necessary information
@@ -368,30 +75,14 @@
if( !$blogSettings )
$blogSettings = new BlogSettings();
- $query = "INSERT INTO ".$this->getPrefix()."blogs (blog,owner_id,about,settings,mangled_blog,status,blog_category_id)
- VALUES ('".Db::qstr($blog->getBlog())."',".
- $blog->getOwner().",'".
- Db::qstr($blog->getAbout())."', '".
- Db::qstr(serialize($blogSettings))."', '".
- TextFilter::urlize($blog->getBlog())."', '".
- Db::qstr($blog->getStatus())."','".
- Db::qstr($blog->getBlogCategoryId())."');";
+ $blogId = $this->add( $blog );
- $result = $this->Execute( $query );
-
- if( !$result ){
- // FIXME: throw an exception?
- return false;
- }
-
-
- $blogId = $this->_db->Insert_ID();
-
- $blog->setId( $blogId );
-
// create the row for the bayesian filter info
$bayesianFilterInfo = new BayesianFilterInfos();
$bayesianFilterInfo->insert( $blogId );
+
+ $this->_cache->setData( $blogId, CACHE_BLOGINFOS, $blog );
+ $this->_cache->setDate( $blog->getMangledBlogName(), CACHE_BLOGIDBYNAME );
// and return the blog identifier
return $blogId;
@@ -438,25 +129,14 @@
$blogs = Array();
while( $row = $result->FetchRow()) {
- $blog = $this->_fillBlogInformation( $row, true );
+ $blog = $this->mapRow( $row );
$blogs[$blog->getId()] = $blog;
}
return $blogs;
- }
-
+ }
/**
- * @see Model::buildSearchCondition
- */
- function buildSearchCondition( $searchTerms )
- {
- $searchCond = "(blog LIKE '%".Db::qstr(trim($searchTerms))."%')";
-
- return( $searchCond );
- }
-
- /**
* returns only an array with all the blog ids
*
* @return an array with blog ids
@@ -542,36 +222,6 @@
return $result;
}
- /**
- * disables a blog, this is done by setting the status of the blog
- * to BLOG_STATUS_DISABLED. The blog an all posts still remain in
- * the database.
- *
- * @param blogId
- * @see deleteBlog
- */
- function disableBlog( $blogId )
- {
- require_once( PLOG_CLASS_PATH."class/database/db.class.php" );
-
- $keyValuePairs = array();
- $keyValuePairs['status'] = BLOG_STATUS_DISABLED;
-
- $query = Db::buildUpdateQuery( BLOGS_TABLENAME,
- $keyValuePairs,
- 'id',
- $blogId );
-
- $result = $this->Execute( $query );
-
- if( !$result || $this->_db->Affected_Rows() == 0 )
- return false;
-
- $this->_cache->removeData( $blogId, CACHE_BLOGINFOS );
-
- return true;
- }
-
/**
* removes all blogs that have 'deleted' status
*
@@ -579,64 +229,32 @@
*/
function purgeBlogs()
{
- // delete blogs marked as disabled leave the username intact.
- // If the username is disabled, the Purge User featuer will delete them
-
- $b_query = "SELECT * FROM ".$this->getPrefix()."blogs WHERE status = ".BLOG_STATUS_DISABLED;
-
- $b_result = $this->Execute( $b_query );
- if( !$b_result )
- return false;
-
- while( $b_row = $b_result->FetchRow()) {
- $this->deleteBlog( $b_row["id"] );
- }
-
- return true;
+ return( $this->delete( "status", BLOG_STATUS_DISABLED ));
}
- /**
+ /**
* @private
*/
- function _getBlogInfoFromQuery( $query, $extendedInfo = false )
+ function mapRow( $row )
{
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- if( $result->RecordCount() == 0 )
- return false;
-
- $row = $result->FetchRow( $result );
- $blogInfo = $this->_fillBlogInformation( $row, $extendedInfo );
- $blogSettings = $this->getBlogSettingsFromField( $row["settings"] );
- $blogInfo->setSettings( $blogSettings );
-
- return $blogInfo;
- }
-
- /**
- * Private function.
- *
- * @private
- */
- function _fillBlogInformation( $query_result, $extended = false )
- {
// source class
include_once( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
// create new BlogInfo
- $blogInfo = new BlogInfo( stripslashes($query_result["blog"]),
- $query_result["owner_id"],
- stripslashes($query_result["about"]),
- unserialize($query_result["settings"]),
- $query_result["id"] );
+ $blogInfo = new BlogInfo( stripslashes($row["blog"]),
+ $row["owner_id"],
+ stripslashes($row["about"]),
+ unserialize($row["settings"]),
+ $row["id"] );
// load information about the blog status
- $blogInfo->setStatus( $query_result["status"] );
+ $blogInfo->setStatus( $row["status"] );
// load information abotu the blog category id
- $blogInfo->setBlogCategoryId( $query_result["blog_category_id"] );
+ $blogInfo->setBlogCategoryId( $row["blog_category_id"] );
+ // counters
+ $blogInfo->setTotalPosts( $row['num_posts'] );
+ $blogInfo->setTotalTrackbacks( $row['num_trackbacks'] );
+ $blogInfo->setTotalComments( $row['num_comments'] );
return $blogInfo;
}
Modified: plog/branches/plog-1.1-daochanges/class/dao/commentscommon.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/commentscommon.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/commentscommon.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -16,6 +16,12 @@
define( "COMMENT_TYPE_COMMENT", 1 );
define( "COMMENT_TYPE_TRACKBACK", 2 );
define( "COMMENT_TYPE_ANY", -1 );
+
+ /**
+ * caches used
+ */
+ define( "CACHE_ARTICLE_COMMENTS", "article_comments" );
+ define( "CACHE_ARTICLE_COMMENTS_BYARTICLE", "article_comments_byarticle" );
/**
* \ingroup DAO
@@ -34,7 +40,6 @@
class CommentsCommon extends Model
{
- var $totalComments;
var $_blogSettings;
var $blogSettings;
var $timeDiff;
@@ -42,13 +47,7 @@
function CommentsCommon()
{
$this->Model();
-
- $this->totalComments = Array();
-
- $this->_blogSettings = Array();
-
- $this->blogSettings = null;
- $this->timeDiff = 0;
+ $this->table = $this->getPrefix()."articles_comments";
}
/**
@@ -60,27 +59,27 @@
*/
function addComment( &$comment )
{
- $filter = new Textfilter();
- $query = "INSERT INTO ".$this->getPrefix().
- "articles_comments (article_id,topic,text,user_name,user_email,
- user_url,parent_id,client_ip,status, normalized_text,normalized_topic,type)
- VALUES (".$comment->getArticleId().",'".Db::qstr($comment->getTopic())."','".
- Db::qstr($comment->getText())."','".$comment->getUserName()."','".$comment->getUserEmail()."','".
- $comment->getUserUrl()."',".
- $comment->getParentId().", '".$comment->getClientIp()."', ".$comment->getStatus().", '".
- Db::qstr($filter->normalizeText($comment->getText()))."', '".
- Db::qstr($filter->normalizeText($comment->getTopic()))."',".$comment->getType().");";
-
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- // retrieve the last id and save it in the object
- $comment->setId( $this->_db->Insert_ID());
-
- return( true );
+ if(( $result = $this->add( $comment ))) {
+ include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE );
+ // update the article comments
+ $article = $comment->getArticle();
+ if( $comment->getType() == COMMENT_TYPE_COMMENT ) {
+ $article->setTotalComments( $article->getTotalComments() + 1 );
+ if( $comment->getStatus() == COMMENT_STATUS_ACTIVE ) {
+ $article->setNumComments( $article->getNumComments() +1 );
+ }
+ }
+ else {
+ $article->setTotalTrackbacks( $article->getTotalTrackbacks() + 1 );
+ if( $comment->getStatus() == COMMENT_STATUS_ACTIVE ) {
+ $article->setNumTrackbackss( $article->getNumTrackbacks() +1 );
+ }
+ }
+ $articles = new Articles();
+ $articles->updateArticle( $article );
+ }
+ return( $result );
}
/**
@@ -94,124 +93,46 @@
* @param itemsPerPage
* @return False if error or an array of ArticleComments objects
*/
- function getPostComments( $artid, $order = COMMENT_ORDER_NEWEST_FIRST, $status = COMMENT_STATUS_ALL, $type = COMMENT_TYPE_ANY, $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
+ function getPostComments( $artid,
+ $order = COMMENT_ORDER_NEWEST_FIRST,
+ $status = COMMENT_STATUS_ALL,
+ $type = COMMENT_TYPE_ANY,
+ $page = -1,
+ $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
- $query = "SELECT * FROM ".$this->getPrefix()."articles_comments WHERE article_id = '".Db::qstr($artid)."'";
- if( $status != COMMENT_STATUS_ALL )
- $query .= " AND status = $status";
- if( $type != COMMENT_TYPE_ANY )
- $query .= " AND type = '".Db::qstr($type)."'";
+ $comments = $this->getMany( "article_id",
+ $artid,
+ CACHE_ARTICLE_COMMENTS_BYARTICLE,
+ Array( CACHE_ARTICLE_COMMENTS => "getId" ),
+ $page,
+ $ItemsPerPage );
+
+ /**
+ * :TODO:
+ * - filter by status!!!
+ * - filter by type!!!
+ * - use the $order parameter!!!
+ */
- // check in which order we should display those comments
- if( $order == COMMENT_ORDER_NEWEST_FIRST )
- $query .= " ORDER BY date DESC";
- else
- $query .= " ORDER BY date ASC";
-
- $result = $this->Execute( $query, $page, $itemsPerPage );
-
- if( !$result )
- return Array();
-
- $comments = Array();
- while ($row = $result->FetchRow()) {
-
- // find out the blogInfo object (after all, all these comments belong to the same
- // blog so there is no risk of finding different blog_ids anywhere!
- if( $this->blogSettings === null ) {
- $prefix = $this->getPrefix();
- $articleId = $row["article_id"];
-
- $query = "SELECT DISTINCT b.settings AS settings FROM {$prefix}blogs b, {$prefix}articles a,
- {$prefix}articles_comments c WHERE c.article_id = a.id AND a.blog_id = b.id
- AND a.id = $articleId";
- $result2 = $this->Execute( $query );
- $tmpRow = $result2->FetchRow();
- $this->blogSettings = Blogs::getBlogSettingsFromField( $tmpRow["settings"] );
-
- $this->timeDiff = $this->blogSettings->getValue( "time_offset" );
+ $result = Array();
+ if( $comments ) {
+ // load the post to get the blog in order to get the time difference
+ $articles = new Articles();
+ $article = $articles->getArticle( $artid );
+ $blog = $article->getBlogInfo();
+ $blogSettings = $blog->getSettings();
+ $timeDiff = $blogSettings->getValue( "time_offset" );
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ foreach( $comments as $comment ) {
+ $date = Timestamp::getDateWithOffset( $comment->getDate(), $timeDiff );
+ $comment->setDate( $date );
+ $result[] = $comment;
}
-
-
- $lastArticleId=$row["article_id"];
-
- // now that we've got the time difference, we can
- // calculate what would the "real" date...
- $date = $row["date"];
- $date = Timestamp::getDateWithOffset( $date, $this->timeDiff );
- $comment = $this->_fillCommentInformation( $row );
-
- $comments[] = $comment;
- }
-
- return $comments;
- }
-
- /**
- * Retrieves all the comments for subquery of posts
- *
- * @private
- */
- function getPostCommentsByIds( $ids, $order = COMMENT_ORDER_NEWEST_FIRST, $status = COMMENT_STATUS_ALL, $type = COMMENT_TYPE_ANY )
- {
-
- $query = "SELECT * FROM ".$this->getPrefix()."articles_comments WHERE article_id IN (".$ids.")";
- if( $type != COMMENT_TYPE_ANY )
- $query .= " AND type = '".Db::qstr($type)."'";
- if( $status != COMMENT_STATUS_ALL )
- $query .= " AND status = '".Db::qstr($status)."'";
-
- // check in which order we should display those comments
- if( $order == COMMENT_ORDER_NEWEST_FIRST )
- $query .= " ORDER BY date DESC";
+ }
else
- $query .= " ORDER BY date ASC";
- $result = $this->Execute( $query );
- if( !$result )
- return false;
+ $result = Array();
- // initialize these two thingies with harmless values
- $blogSettings = null;
- $timeDiff = 0;
-
- while ($row = $result->FetchRow()) {
-
- // find out the blogInfo object (after all, all these comments belong to the same
- // blog so there is no risk of finding different blog_ids anywhere!
- if( $this->blogSettings === null ) {
- $prefix = $this->getPrefix();
- $articleId = $row["article_id"];
-
- $query = "SELECT DISTINCT b.settings AS settings FROM {$prefix}blogs b, {$prefix}articles a,
- {$prefix}articles_comments c WHERE c.article_id = a.id AND a.blog_id = b.id
- AND a.id = $articleId";
- $result2 = $this->Execute( $query );
- $tmpRow = $result2->FetchRow();
- $this->blogSettings = Blogs::getBlogSettingsFromField( $tmpRow["settings"] );
-
- $this->timeDiff = $this->blogSettings->getValue( "time_offset" );
- }
-
-
- $lastArticleId=$row["article_id"];
-
- // now that we've got the time difference, we can
- // calculate what would the "real" date...
- $date = $row["date"];
- $date = Timestamp::getDateWithOffset( $date, $this->timeDiff );
-
- /**$comment = new UserComment( $row["article_id"], $row["parent_id"], $row["topic"],
- $row["text"], $date, $row["user_name"], $row["user_email"],
- $row["user_url"], $row["client_ip"], $row["spam_rate"], $row["status"],
- $row["id"] );**/
-
- $comment = $this->_fillCommentInformation( $row );
-
- // save the comment in the array
- $comments[$lastArticleId][]=$comment;
- }
-
- return $comments;
+ return( $result );
}
/**
@@ -235,85 +156,29 @@
// get the number of items and return it to the caller
return( $this->getNumItems( $table, $cond ));
- }
-
- /**
- * Returns the total number of comments for a given blog
- *
- * @param artId the post id
- * @param status
- * @return The number of comments
- */
- function getNumBlogComments( $blogId, $status = COMMENT_STATUS_ALL, $type = COMMENT_TYPE_ANY )
- {
- // create the table name
- $prefix = $this->getPrefix();
- $table = "{$prefix}articles_comments c, {$prefix}articles a";
- // and the condition if any...
- $cond = "a.blog_id = '".Db::qstr($blogId)."' AND c.article_id = a.id";
- if( $status != COMMENT_STATUS_ALL )
- $cond .= " AND c.status = '".Db::qstr($status)."'";
- if( $type != COMMENT_TYPE_ANY )
- $cond .= " AND c.type = '".Db::qstr($type)."'";
-
- // get the number of items and return it to the caller
- return( $this->getNumItems( $table, $cond ));
}
/**
* Retrieves only one post from a given article
*/
- function getPostComment( $artid, $commentid, $type = COMMENT_TYPE_ANY )
+ function getPostComment( $commentId, $articleId = -1, $type = COMMENT_TYPE_ANY )
{
- $query = "SELECT * FROM ".$this->getPrefix()."articles_comments
- WHERE id = '".Db::qstr($commentid)."' AND article_id = '".Db::qstr($artid)."'";
- if( $type != COMMENT_TYPE_ANY )
- $query .= " AND type = '".Db::qstr($type)."'";
-
- $result = $this->Execute( $query );
-
- if( !$result )
+ $comment = $this->get( "id" , $commentid, CACHE_ARTICLE_COMMENTS );
+ if( !$comment )
return false;
-
- $row = $result->FetchRow();
- $comment = $this->_fillCommentInformation( $row );
-
- return $comment;
+ if( $articleId > -1 ) {
+ if( $comment->getArticleId() != $articleId )
+ return false;
+ }
+ if( $type != COMMENT_TYPE_ANY ) {
+ if( $comment->getType() != $type ) {
+ return false;
+ }
+ }
+
+ return( $comment );
}
- /**
- * Returns true if there already is a comment in the database with the same
- * article_id field, topic, text, replying to the same comment, username and so on
- * Useful in case we want to check if the user sent the same comment by mistake
- * by pressing the 'reload' button twice or something...
- *
- * @return Returns true if there already is such comment or false otherwise.
- */
- function getIdenticalComment( $topic, $text, $articleId, $parentId = 0, $userName = "", $userEmail = "", $userUrl = "", $clientIp = "0.0.0.0", $type = COMMENT_TYPE_ANY )
- {
- $query = "SELECT COUNT(*) AS total FROM ".$this->getPrefix()."articles_comments
- WHERE topic = '".Db::qstr($topic)."' AND text = '".Db::qstr($text)."'
- AND article_id = $articleId AND parent_id = $parentId AND
- client_ip = '$clientIp' AND user_name = '$userName' AND
- user_email = '$userEmail' AND user_url = '$userUrl'
- AND date <= NOW()";
- if( $type != COMMENT_TYPE_ANY )
- $query .= " AND type = '".Db::qstr($type)."'";
-
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- $row = $result->FetchRow();
-
- if( $row["total"] >= 1 )
- return true;
- else
- return false;
- }
-
/**
* Removes a comment from a post. It also updates all the other posts that
* have this one as the parent and makes them look as if they were 'top level'
@@ -325,43 +190,20 @@
*/
function deletePostComment( $artid, $commentid, $type = COMMENT_TYPE_ANY )
{
- $query = "DELETE FROM ".$this->getPrefix()."articles_comments
- WHERE id = '".Db::qstr($commentid)."' AND article_id = '".Db::qstr($artid)."'";
- if( $type != COMMENT_TYPE_ANY )
- $query .= " AND type = '".Db::qstr($type)."'";
-
- $result = $this->Execute( $query );
-
- if( $this->_db->Affected_Rows( $result ) == 0 )
- return;
-
- // update all the other posts
- $query = "UPDATE ".$this->getPrefix()."articles_comments SET parent_id = 0 WHERE parent_id = ".$commentid." AND article_id = ".$artid.";";
- $result = $this->Execute( $query );
-
- return $result;
+ $comment = $this->getPostComment( $commentid, $artid, $type );
+ if( $comment ) {
+ $this->delete( "id", $commentid );
+ // update all the other posts
+ $query = "UPDATE ".$this->getPrefix()."articles_comments SET parent_id = 0 WHERE parent_id = ".$commentid." AND article_id = ".$artid.";";
+ $result = $this->Execute( $query );
+ $this->_cache->removeData( $comment->getId(), CACHE_ARTICLE_COMMENTS );
+ $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE );
+ }
+ else
+ return false;
}
/**
- * Removes all the comments from a post.
- *
- * @param artId The article identifier
- * @param type
- */
- function deletePostComments( $artId, $type = COMMENT_TYPE_ANY )
- {
- $query = "DELETE FROM ".$this->getPrefix()."articles_comments
- WHERE article_id = '".Db::qstr($artId)."'";
- if( $type != COMMENT_TYPE_ANY )
- $query .= " AND type = '".Db::qstr($type)."'";
-
-
- $result = $this->Execute( $query );
-
- return $result;
- }
-
- /**
* updates the status of a comment, regarding its spam status...
*
* @param commentId
@@ -371,15 +213,21 @@
*/
function updateCommentStatus( $commentId, $status, $type = COMMENT_TYPE_ANY )
{
- $query = "UPDATE ".$this->getPrefix()."articles_comments SET
- status = '".Db::qstr($status)."', date = date
- WHERE id = '".Db::qstr($commentId)."'";
- if( $type != COMMENT_TYPE_ANY )
- $query .= " AND type = '".Db::qstr($type)."'";
-
- $result = $this->Execute( $query );
-
- return $result;
+ $comment = $this->getComment( $commentId );
+ if( !$comment )
+ return false;
+
+ if( $type != COMMENT_TYPE_ANY )
+ if( $comment->getType() != $type )
+ return false;
+
+ $comment->setStatus( $status );
+ if(($result = $this->update( $comment ))) {
+ $this->_cache->setData( $comment->getId(), CACHE_ARTICLE_COMMENTS, $comment );
+ $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE );
+ }
+
+ return( $result );
}
/**
@@ -394,6 +242,11 @@
if( $type != COMMENT_TYPE_ANY )
$query .= " AND type = '".Db::qstr($type)."'";
+ /**
+ * :TODO:
+ *
+ * - clean the whole cache of comments!
+ */
return $this->Execute( $query );
}
@@ -405,22 +258,16 @@
*/
function getComment( $id, $type = COMMENT_TYPE_ANY )
{
- $query = "SELECT * FROM ".$this->getPrefix()."articles_comments
- WHERE id = '".Db::qstr($id)."'";
- if( $type != COMMENT_TYPE_ANY )
- $query .= " AND type = '".Db::qstr($type)."'";
-
- $result = $this->Execute( $query );
-
- if( !$result )
+ $comment = $this->get( "id" , $commentid, CACHE_ARTICLE_COMMENTS );
+ if( !$comment )
return false;
+ if( $type != COMMENT_TYPE_ANY ) {
+ if( $comment->getType() != $type ) {
+ return false;
+ }
+ }
- if( $result->RowCount() == 0 )
- return false;
-
- $row = $result->FetchRow();
-
- return $this->_fillCommentInformation( $row );
+ return( $comment );
}
/**
@@ -432,10 +279,14 @@
*/
function getBlogComments( $blogId, $order = COMMENT_ORDER_NEWEST_FIRST, $status = COMMENT_STATUS_ALL, $type = COMMENT_TYPE_ANY, $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
+ /**
+ * :TODO:
+ * - implement this method in a better way!
+ */
$prefix = $this->getPrefix();
$query = "SELECT c.*
- FROM {$prefix}articles_comments c, {$prefix}articles a
- WHERE a.blog_id = '".Db::qstr($blogId)."' AND a.id = c.article_id";
+ FROM {$prefix}articles_comments c
+ WHERE c.blog_id = '".Db::qstr( $blogId )."'";
if( $status != COMMENT_STATUS_ALL )
$query .= " AND status = $status";
if( $type != COMMENT_TYPE_ANY )
@@ -458,76 +309,30 @@
$comments = Array();
$articles = new Articles();
while( $row = $result->FetchRow()) {
- // load the article to which this comment belongs
- $comment = $this->_fillCommentInformation( $row );
- $article = $articles->getBlogArticle( $comment->getArticleId(), $blogId );
- $comment->setArticle( $article );
- // and store everything in the array
- $comments[] = $comment;
+ $comments[] = $this->mapRow( $row );
}
return $comments;
}
- /**
- * code factored out and made to be reused through several functions here...
- *
- * @private
- */
- function _fillCommentInformation( $row )
- {
+ function mapRow( $row )
+ {
require_once( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
require_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- // ---
- // this stuff is another disgusting hack to make comments
- // be aware of time differences that may have been set by
- // users in their blogs... actually, it will make the whole
- // thing run a little bit slower because for every article
- // that we fetch, we need to know the time difference
- // and that means, additional accesses to the database :(
- // But hey, users demand these things and we are not in the position
- // to deny anything, are we? :P
- // ---
- // at the same time, we're going to brake some of our "nicely"
- // implemented bussiness logic with the query below, bypassing all
- // our objects and directly fetching info from the database, just for
- // the sake of being able to do things with a single query rather
- // than needing at least two to do the same. We would have to first
- // find to which blog the given article belongs and then use another
- // query to find its settings... If we do it this way, we can still
- // do it in one query and get a nice BlogSettings object with the
- // information that we need. Dirty but works :S
- // ---
+
$prefix = $this->getPrefix();
$date = $row["date"];
$articleId = $row["article_id"];
-
- // let's try and keep some kind of cache for this...
- if( empty($this->_blogSettings[$articlId])) {
- $query = "SELECT DISTINCT b.settings AS settings
- FROM {$prefix}blogs b, {$prefix}articles a,
- {$prefix}articles_comments c
- WHERE c.article_id = a.id AND
- a.blog_id = b.id
- AND a.id = $articleId";
- $result = $this->Execute( $query );
- if( !$result )
- return false;
-
- $tmpRow = $result->FetchRow();
- $blogSettings = Blogs::getBlogSettingsFromField( $tmpRow["settings"] );
- $this->_blogSettings[$articleId] = $blogSettings;
- }
- else {
- $blogSettings = $this->_blogSettings[$articleId];
- }
-
+ $blogId = $row["blog_id"];
+
+ $blogs = new Blogs();
+ $blogInfo = $blogs->getBlogInfo( $blogId );
+ $blogSettings = $blogInfo->getSettings();
$timeDiff = $blogSettings->getValue( "time_offset" );
- // now that we've got the time difference, we can
- // calculate what would the "real" date...
$date = Timestamp::getDateWithOffset( $date, $timeDiff );
$comment = new UserComment( $row["article_id"],
+ $row['blog_id'],
$row["parent_id"],
$row["topic"],
$row["text"],
@@ -541,6 +346,6 @@
$row["id"] );
return $comment;
- }
+ }
}
?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/model.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/model.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/model.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -155,8 +155,201 @@
{
return $this->_db->ErrorMsg();
}
+
+ function get( $field, $value, $cacheId, $caches = null )
+ {
+ $dbObject = $this->_cache->getData( $value, $cacheId );
+ if( !$dbObject ) {
+ $this->log->debug("get: $field:$value - cache = $cacheId" );
+ $query = "SELECT * FROM ".$this->table." WHERE {$field} = '".Db::qstr( $value )."'";
+
+ $result = $this->Execute( $query );
+
+ if( !$result )
+ return false;
+
+ if( $result->RowCount() == 0 )
+ return false;
+
+ $row = $result->FetchRow();
+
+ $dbObject = $this->mapRow( $row );
+
+ $this->_cache->setData( $value, $cacheId, $dbObject );
+ if( $caches ) {
+ foreach( $caches as $cache => $getter ) {
+ $this->_cache->setData( $dbObject->$getter(), $cache, $dbObject );
+ }
+ }
+ }
+
+ return( $dbObject );
+
+ }
+
/**
+ * given several conditions, concatenates them with an "AND" operator. If one of the
+ * items of the array is an empty string, the condition will not be used
+ *
+ * @deprecated use Db Class build(Select|Insert|...)Query instead
+ * @param conds
+ * @return a string
+ */
+ function buildWhereCondition( $conds = Array(), $useWhere = true )
+ {
+ $valid = 0;
+ $where = "";
+
+ foreach( $conds as $cond ) {
+ $this->log->debug( "Processing condition = ".$cond );
+ if( $cond ) {
+ // only if the condition is not empty...
+
+ if( $valid > 0 )
+ $where .= " AND ";
+
+ // append the condition
+ $where .= "$cond";
+
+ // we've got a valid condition
+ $valid++;
+ }
+ }
+
+ if( $valid > 0 && $useWhere )
+ $where = "WHERE $where";
+
+ return( $where );
+ }
+
+ function getAll( $key, $cacheId, $itemCaches = null, $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
+ {
+ return( $this->getMany( $key, null, $cacheId, $itemCaches, $page, $itemsPerPage ));
+ }
+
+ function getMany( $key, $value, $cacheId, $itemCaches = null, $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
+ {
+ $dbObjects = $this->_cache->getData( $value, $cacheId );
+ if( !$dbObjects ) {
+ $this->log->debug("getMany: $key:$value - cache = $cacheId -- cache miss!");
+ $query = "SELECT * FROM ".$this->table;
+ if( $value )
+ $query .= " WHERE {$key} = '".Db::qstr($value)."'";
+ $this->log->debug("query = $query");
+
+ $result = $this->Execute( $query );
+
+ if( !$result )
+ return false;
+
+ if( $result->RowCount() == 0 )
+ return false;
+
+ $dbObjects = Array();
+ while( $row = $result->FetchRow()) {
+ $dbObjects[] = $this->mapRow( $row );
+ if( $itemCaches ) {
+ foreach( $caches as $cache => $getter ) {
+ $this->_cache->setData( $dbObject->$getter(), $cache, $dbObject );
+ }
+ }
+ }
+
+ $this->_cache->setData( $value, $cacheId, $dbObjects );
+ }
+
+ if( $page > -1 ) {
+ // return only a subset of the items
+ $start = (($page - 1) * $itemsPerPage );
+ $dbObjects = array_slice( $dbObjects, $start, $itemsPerPage );
+ }
+
+ return( $dbObjects );
+ }
+
+
+ function add( &$dbObject, $cacheId = null )
+ {
+ $fields = $dbObject->getFieldGetters();
+ $fieldsString = '';
+ $fieldsValuesString = '';
+
+ $sql = "INSERT INTO `".$this->table."` (";
+
+ foreach ($fields as $field => $getter)
+ {
+ if( $field != "id" ) {
+ // let's ignore the primary key!
+ $fieldsString .= $field.", ";
+
+ $value = $dbObject->$getter();
+ if( is_array( $value )) $value = serialize( $value );
+ elseif( is_object( $value )) $value = serialize( $value );
+ elseif( strtolower(get_class( $value )) == "timestamp" )
+ $value = $value->getTimestamp();
+ $value = Db::qstr($value);
+ $fieldValuesString .= "'" . $value . "', ";
+ }
+ }
+
+ $sql .= substr($fieldsString, 0, -2) . ") VALUES (".substr($fieldValuesString, 0, -2).")";
+
+ $result = $this->Execute( $sql );
+ if( !$result )
+ return false;
+
+ $dbObject->setId( $this->_db->Insert_ID());
+
+ if( $cacheId ) {
+ foreach( $cacheId as $cache => $getter ) {
+ $this->_cache->setData( $dbObject->{$getter}(), $cache, $dbObject );
+ }
+ }
+
+ return( $dbObject->getId());
+ }
+
+ function update( &$dbObject )
+ {
+ include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
+
+ $fields = $dbObject->getFieldGetters();
+ $sql = "UPDATE `".$this->table."` SET ";
+
+ foreach ($fields as $field => $getter)
+ {
+ $value = $dbObject->$getter();
+ if( is_array( $value )) $value = serialize( $value );
+ elseif( strtolower(get_class( $value )) == "timestamp" )
+ $value = $value->getTimestamp();
+ elseif( is_object( $value )) $value = serialize( $value );
+
+ $value = Db::qstr($value);
+ $sql .= "`" . $field . "`='" . $value . "', ";
+ }
+
+ $sql = substr($sql, 0, -2) . " WHERE id = '".Db::qstr($dbObject->getId())."'";
+
+ $result = $this->Execute( $sql );
+
+ if( !$result )
+ return false;
+
+ if( $this->_db->Affected_Rows() == 0 )
+ return false;
+ else
+ return true;
+ }
+
+ function delete( $field, $value )
+ {
+ $query = "DELETE FROM ".$this->table." WHERE {$field} = '{$value}'";
+ $result = $this->Execute( $query );
+ return( $this->_db->Affected_Rows());
+ }
+
+ /**
* returns the current database prefix
*
* @deprecated the prefix should be set/added by the Db Classes, not by the model
@@ -222,41 +415,6 @@
function buildSearchCondition( $searchTerms )
{
return( "" );
- }
-
- /**
- * given several conditions, concatenates them with an "AND" operator. If one of the
- * items of the array is an empty string, the condition will not be used
- *
- * @deprecated use Db Class build(Select|Insert|...)Query instead
- * @param conds
- * @return a string
- */
- function buildWhereCondition( $conds = Array(), $useWhere = true )
- {
- $valid = 0;
- $where = "";
-
- foreach( $conds as $cond ) {
- $this->log->debug( "Processing condition = ".$cond );
- if( $cond ) {
- // only if the condition is not empty...
-
- if( $valid > 0 )
- $where .= " AND ";
-
- // append the condition
- $where .= "$cond";
-
- // we've got a valid condition
- $valid++;
- }
- }
-
- if( $valid > 0 && $useWhere )
- $where = "WHERE $where";
-
- return( $where );
- }
+ }
}
-?>
+?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/mylink.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/mylink.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/mylink.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -44,6 +44,18 @@
$this->_rssFeed = $rssFeed;
$this->setDate( $date );
$this->setProperties( $properties );
+
+ $this->_pk = "pk";
+ $this->_fields = Array(
+ "category_id" => "getCategoryId",
+ "url" => "getUrl",
+ "name" => "getName",
+ "description" => "getDescription",
+ "blog_id" => "getBlogId",
+ "rss_feed" => "getRssFeed",
+ "date" => "getDate",
+ "properties" => "getProperties"
+ );
}
/**
@@ -163,6 +175,17 @@
$this->_timestamp = new Timestamp( $newDate );
}
+ function getMyLinkCategory()
+ {
+ if( !$this->_category ) {
+ include_once( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+ $categories = new MyLinksCategories();
+ $this->_category = $categories->getMyLinksCategory( $this->getCategoryId());
+ }
+
+ return( $this->_category );
+ }
+
function getDate()
{
return $this->_date;
Modified: plog/branches/plog-1.1-daochanges/class/dao/mylinks.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/mylinks.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/mylinks.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -2,8 +2,10 @@
include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/mylink.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/bloglinks.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
+ define( "CACHE_MYLINKS_ALL", "cache_mylinks_all" );
+ define( "CACHE_MYLINKS", "cache_mylinks" );
/**
* \ingroup DAO
@@ -12,6 +14,13 @@
*/
class MyLinks extends Model
{
+
+ function MyLinks()
+ {
+ $this->Model();
+
+ $this->table = $this->getPrefix()."mylinks";
+ }
/**
* Retrieves the links of the given blog.
@@ -23,43 +32,26 @@
*/
function getLinks( $blogId, $categoryId = 0, $page = -1, $itemsPerPage = 15 )
{
- $blogLinks = $this->getBlogLinks( $blogId );
+ $blogLinks = $this->getMany( "blog_id",
+ $blogId,
+ CACHE_MYLINKS_ALL,
+ Array( CACHE_MYLINKS => "getId" ),
+ $page,
+ $itemsPerPage );
+
+ $result = Array();
+ if( $blogLinks && $categoryId > 0 ) {
+ foreach( $blogLinks as $link ) {
+ if( $link->getCategoryId() == $categoryId )
+ $result[] = $link;
+ }
+ }
+ else
+ $result = $blogLinks;
- $myLinks = $blogLinks->getLinksForCategory( $categoryId );
-
- // check if we're using any paging
- if( $page > -1 ) {
- $start = (($page - 1) * $itemsPerPage);
- $myLinks = array_slice( $myLinks, $start, $itemsPerPage );
- }
-
- return $myLinks;
+ return( $result );
}
- function getBlogLinks( $blogId )
- {
- $blogLinks = $this->_cache->getData( $blogId, CACHE_BLOGLINKS );
-
- if( !$blogLinks ) {
- $query = "SELECT * FROM ".$this->getPrefix()."mylinks WHERE blog_id = '".Db::qstr($blogId)."' ORDER BY id;";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- $links = Array();
-
- while( $row = $result->FetchRow()) {
- $link = $this->_fillMyLinkInformation( $row );
- array_push( $links, $link );
- }
- $blogLinks = new BlogLinks( $blogId, $links );
- $this->_cache->setData( $blogId, CACHE_BLOGLINKS, $blogLinks );
- }
- return $blogLinks;
- }
-
/**
* returns how many links a blog has
*
@@ -69,9 +61,7 @@
*/
function getNumLinks( $blogId, $categoryId = 0 )
{
- $blogLinks = $this->getBlogLinks( $blogId );
- $categoryLinks = $blogLinks->getLinksForCategory( $categoryId );
- return count( $categoryLinks );
+ return( count( $this->getLinks( $blogId, $categoryId )));
}
/**
@@ -81,25 +71,24 @@
* @param blogId The blog id
* @return True if successful or false otherwise.
*/
- function addMyLink( $myLink, $blogId )
+ function addMyLink( &$myLink )
{
- $query = "INSERT INTO ".$this->getPrefix()."mylinks (name,url,description,category_id,blog_id,properties,rss_feed)
- VALUES ('".Db::qstr($myLink->getName())."','".
- Db::qstr($myLink->getUrl())."','".
- Db::qstr($myLink->getDescription())."',".
- $myLink->getCategoryId().",".
- $blogId.",'".
- Db::qstr(serialize($myLink->getProperties()))."','".
- Db::qstr($myLink->getRssFeed())."');";
-
- $result = $this->Execute( $query );
+ $result = $this->add( $myLink );
if( $result ) {
+ // clean the cache
+ /**
+ * :TODO:
+ * this doesn't seem to work very well!!!
+ */
+ $this->_cache->removeData( $myLink->getId(), CACHE_MYLINKS );
+ $this->_cache->removeData( "all", CACHE_MYLINKS_ALL );
// mark the corresponding link categories as modified now
$linkCategories = new MyLinksCategories();
- $linkCategories->updateCategoryModificationDate( $myLink->getCategoryId());
-
- $this->_cache->removeData( $blogId, CACHE_BLOGLINKS );
+ $category = $myLink->getMyLinkCategory();
+ $category->setLastModification( Timestamp::getNowTimestamp());
+ $category->setNumLinks( $category->getNumLinks() + 1 );
+ $linkCategories->updateMyLinksCategory( $category );
}
return $result;
@@ -114,19 +103,20 @@
*/
function deleteMyLink( $linkId, $blogId )
{
- $query = "DELETE FROM ".$this->getPrefix()."mylinks WHERE id = '".Db::qstr($linkId)."' AND blog_id = ".$blogId.";";
-
- $result = $this->Execute( $query );
-
- /*if( $result ) {
- // mark the corresponding link categories as modified now
+ $link = $this->getMyLink( $linkId, $blogId );
+ if( $link ) {
+ $this->delete( "id", $linkId );
+ $this->_cache->removeData( $blogId, CACHE_MYLINKS_ALL );
+ $this->_cache->removeData( $linkId, CACHE_MYLINKS );
$linkCategories = new MyLinksCategories();
- $linkCategories->updateCategoryModificationDate( $myLink->getCategoryId());
- }*/
-
- $this->_cache->removeData( $blogId, CACHE_BLOGLINKS );
-
- return $result;
+ $linkCategory = $link->getMyLinkCategory();
+ $linkCategory->setLastModification( Timestamp::getNowTimestamp());
+ $category->setNumLinks( $category->getNumLinks() - 1 );
+ $linkCategories->updateMyLinkCategory( $linkCategory );
+ return( true );
+ }
+ else
+ return false;
}
/**
@@ -136,13 +126,11 @@
*/
function deleteBlogMyLinks( $blogId )
{
- $query = "DELETE FROM ".$this->getPrefix()."mylinks WHERE blog_id = $blogId";
-
- $result = $this->Execute( $query );
-
- $this->_cache->removeData( $blogId, CACHE_BLOGLINKS );
-
- return $result;
+ if( $this->delete( "blog_id", $blogId )) {
+ return( $this->_cache->removeData( $blogId, CACHE_MYLINKS_ALL ));
+ }
+ else
+ return false;
}
/**
@@ -154,29 +142,17 @@
*/
function getMyLink( $linkId, $blogId = -1 )
{
- $blogLink = $this->_cache->getData( $linkId, CACHE_MYLINKS );
+ $blogLink = $this->get( "id", $linkId, CACHE_MYLINKS );
+ if( !$blogLink )
+ return false;
- if ( !$blogLink || ( $blogLink->getBlogId() != $blogId && $blogId != -1 ) ) {
- $query = "SELECT * FROM ".$this->getPrefix()."mylinks WHERE id = ".Db::qstr($linkId);
- if( $blogId > 0 )
- $query .= " AND blog_id = '".$blogId."';";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- if( $result->RecordCount() == 0 )
- return false;
-
- $row = $result->FetchRow();
- $blogLink = $this->_fillMyLinkInformation( $row );
-
- // update the cache
- $this->_cache->setData( $linkId, CACHE_MYLINKS, $blogLink );
- }
-
- return $blogLink;
+ if( $blogId == -1 )
+ return $blogLink;
+
+ if( $blogLink->getBlogId() == $blogId )
+ return $blogLink;
+ else
+ return false;
}
/**
@@ -185,38 +161,26 @@
* @param myLink A MyLink object with the information we'd like to update.
* @return True if successful or false otherwise.
*/
- function updateMyLink( $myLink )
+ function updateMyLink( &$myLink )
{
- $query = "UPDATE ".$this->getPrefix()."mylinks SET
- name = '".Db::qstr($myLink->getName())."',
- description = '".Db::qstr($myLink->getDescription())."',
- url = '".Db::qstr($myLink->getUrl())."',
- category_id = ".$myLink->getCategoryId().",
- date = date,
- properties = '".Db::qstr(serialize($myLink->getProperties()))."',
- rss_feed = '".Db::qstr($myLink->getRssFeed())."'
- WHERE id = ".$myLink->getId()." AND blog_id = ".$myLink->getBlogId().";";
+ $result = $this->update( $myLink );
- $result = $this->Execute( $query );
-
- if( !$result )
+ if( !$result ) {
return false;
- else {
- // mark the corresponding link categories as modified now
- $linkCategories = new MyLinksCategories();
- $linkCategories->updateCategoryModificationDate( $myLink->getCategoryId());
+ }
- $this->_cache->removeData( $myLink->getBlogId(), CACHE_BLOGLINKS );
+ // mark the corresponding link categories as modified now
+ $linkCategories = new MyLinksCategories();
+ $linkCategories->updateCategoryModificationDate( $myLink->getCategoryId());
+
+ $this->_cache->removeData( $myLink->getId(), CACHE_MYLINKS );
+ $this->_cache->removeData( "all", CACHE_MYLINKS_ALL );
- return true;
- }
+ return true;
}
-
- /**
- * @private
- */
- function _fillMyLinkInformation( $row )
- {
+
+ function mapRow( $row )
+ {
$blogLink = new MyLink( $row["name"], $row["description"],
$row["url"], $row["blog_id"], $row["category_id"],
$row["date"], $row["rss_feed"],
@@ -224,6 +188,7 @@
$row["id"] );
return $blogLink;
- }
+
+ }
}
-?>
+?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/mylinkscategories.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/mylinkscategories.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/mylinkscategories.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -11,6 +11,12 @@
define( "MYLINKS_CATEGORIES_LESS_LINKS_FIRST", 4 );
define( "MYLINKS_CATEGORIES_LAST_UPDATED_FIRST", 5 );
define( "MYLINKS_CATEGORIES_LAST_UPDATED_LAST", 6 );
+
+ /**
+ * cache ids
+ */
+ define( "CACHE_MYLINKCATEGORIES_ALL", "mylinks_categories_all" );
+ define( "CACHE_MYLINKCATEGORIES", "mylinks_categories" );
/**
* \ingroup DAO
@@ -19,6 +25,13 @@
*/
class MyLinksCategories extends Model
{
+
+ function MyLinksCategories()
+ {
+ $this->Model();
+
+ $this->table = $this->getPrefix()."mylinks_categories";
+ }
/**
* Returns the categories for my_links for a given blog
@@ -28,22 +41,16 @@
* @param page
* @param itemsPerPage
*/
- function getMyLinksCategories( $blogId,
+ function getMyLinksCategories( $blogId,
$order = MYLINKS_CATEGORIES_NO_ORDER,
$page = -1,
$itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
- $prefix = $this->getPrefix();
- // basic query
- $query = "SELECT c.id AS id, c.name AS name, c.blog_id AS blog_id,
- c.last_modification AS last_modification, c.properties AS properties,
- IF(l.id IS NULL, 0, COUNT(*)) AS num_links
- FROM {$prefix}mylinks_categories c LEFT JOIN {$prefix}mylinks l
- ON l.blog_id = c.blog_id AND l.category_id = c.id
- WHERE c.blog_id= $blogId
- GROUP BY c.id";
-
- if( $order == MYLINKS_CATEGORIES_ALPHABETICAL_ORDER ) {
+ /*
+ * :TODO:
+ * Implement sorting here!!!
+ */
+ /*if( $order == MYLINKS_CATEGORIES_ALPHABETICAL_ORDER ) {
$query .= " ORDER BY c.name ASC";
}
elseif( $order == MYLINKS_CATEGORIES_REVERSE_ALPHABETICAL_ORDER ) {
@@ -60,35 +67,16 @@
}
elseif( $order == MYLINKS_CATEGORIES_LAST_UPDATED_LAST ) {
$query .= " ORDER BY c.last_modification ASC";
- }
+ }*/
- // execute the query
- $result = $this->Execute( $query, $page, $itemsPerPage );
-
- if( !$result )
- return Array();
-
- if( $result->RowCount() == 0 )
- return Array();
-
- $myLinks = new MyLinks();
- $blogLinks = $myLinks->getLinks( $blogId );
-
- $myLinksCategories = Array();
- while( $row = $result->fetchRow($result)) {
- // configure the data for the category
- $myLinksCategory = new MyLinksCategory( $row["name"], $row["blog_id"], $row["num_links"],
- unserialize($row["properties"]), $row["id"] );
- $myLinksCategories[$myLinksCategory->getId()] = $myLinksCategory;
- }
-
- // now assign the links to the correct category
- foreach( $blogLinks as $blogLink ) {
- if( $myLinksCategories[$blogLink->getCategoryId()] )
- $myLinksCategories[$blogLink->getCategoryId()]->addLink( $blogLink );
- }
-
- return $myLinksCategories;
+ $blogCategories = $this->getMany( "blog_id",
+ $blogId,
+ CACHE_MYLINKCATEGORIES_ALL,
+ Array( CACHE_MYLINKCATEGORIES => "getId" ),
+ $page,
+ $itemsPerPage );
+
+ return( $blogCategories );
}
/**
@@ -97,17 +85,13 @@
* @param linkCategory A MyLinkCategory object with the information we need.
* @return Returns true if successful or false otherwise.
*/
- function addMyLinksCategory( $myLinksCategory )
+ function addMyLinksCategory( &$myLinksCategory )
{
- $query = "INSERT INTO ".$this->getPrefix()."mylinks_categories (name, blog_id, properties)
- VALUES ('".
- Db::qstr($myLinksCategory->getName())."', ".
- $myLinksCategory->getBlogId().", '".
- Db::qstr(serialize($myLinksCategory->getProperties()))."');";
-
- $result = $this->Execute( $query );
-
- return $result;
+ if(( $result = $this->add( $myLinksCategory, Array( CACHE_MYLINKCATEGORIES => "getId" )))) {
+ $this->_cache->removeData( "all", CACHE_MYLINKCATEGORIES_ALL );
+ }
+
+ return( $result );
}
/**
@@ -119,13 +103,15 @@
*/
function deleteMyLinksCategory( $categoryId, $blogId )
{
- $query = "DELETE FROM ".$this->getPrefix()."mylinks_categories
- WHERE id = '".Db::qstr($categoryId)."'
- AND blog_id = '".Db::qstr($blogId)."';";
-
- $result = $this->Execute( $query );
-
- return $result;
+ $category = $this->getMyLinksCategory( $categoryId, $blogId );
+ if( $category ) {
+ if( $this->delete( "id", $categoryId )) {
+ $this->_cache->removeData( $category->getId(), CACHE_MYLINKSCATEGORIES );
+ $this->_cache->removeData( "all", CACHE_MYLINKSCATEGORIES_ALL );
+ }
+ }
+ else
+ return false;
}
/**
@@ -135,11 +121,12 @@
*/
function deleteBlogMyLinksCategories( $blogId )
{
- $query = "DELETE FROM ".$this->getPrefix()."mylinks_categories WHERE blog_id = $blogId";
-
- $result = $this->Execute( $query );
-
- return $result;
+ /**
+ * :TODO:
+ *
+ * clean all the caches!
+ */
+ return( $this->delete( "blog_id", $blogId ));
}
/**
@@ -151,32 +138,10 @@
*/
function getMyLinksCategory( $categoryId, $blogId = 0 )
{
- $prefix = $this->getPrefix();
-// $query = "SELECT c.id AS id, c.name AS name, c.blog_id AS blog_id,
-// c.last_modification AS last_modification, c.properties AS properties,
-// COUNT(*) AS num_links
-// FROM {$prefix}mylinks l, {$prefix}mylinks_categories c
-// WHERE c.id = ".Db::qstr($categoryId)." AND l.category_id = c.id ";
-//
-// if( $blogId > 0 )
-// $query .= " AND c.blog_id = ".Db::qstr($blogId)." AND l.blog_id = c.blog_id";
+ $myLinksCategory = $this->get( "id", $categoryId, CACHE_MYLINKSCATEGORIES );
+ if( $blogId > 0 && $myLinksCategory->getBlogId() != $blogId )
+ return false;
- $query = "SELECT c.id AS id, c.name AS name, c.blog_id AS blog_id,
- c.last_modification AS last_modification, c.properties AS properties,
- IF(l.id IS NULL, 0, COUNT(*)) AS num_links
- FROM {$prefix}mylinks_categories c LEFT JOIN {$prefix}mylinks l ON l.blog_id = c.blog_id AND l.category_id = c.id
- WHERE c.id = ".Db::qstr($categoryId)." ";
-
- $query .= " GROUP BY c.id;";
-
- $result = $this->Execute( $query );
-
- if( !$result || $result->RecordCount() == 0 )
- return false;
-
- $row = $result->FetchRow();
- $myLinksCategory = $this->_fillMyLinksCategoryFromRow( $row );
-
return $myLinksCategory;
}
@@ -188,14 +153,12 @@
*/
function updateMyLinksCategory( $category )
{
- $query = "UPDATE ".$this->getPrefix()."mylinks_categories SET
- name = '".Db::qstr($category->getName())."',
- properties = '".Db::qstr(serialize($category->getProperties()))."'
- WHERE id = ".$category->getId()." AND blog_id = ".$category->getBlogId().";";
-
- $result = $this->Execute( $query );
-
- return $result;
+ if( ($result = $this->update( $category ))) {
+ $this->_cache->setData( $category->getId(), CACHE_MYLINKSCATEGORIES, $category );
+ $this->_cache->removeData( "all", CACHE_MYLINKSCATEGORIES_ALL );
+ }
+
+ return( $result );
}
/**
@@ -213,21 +176,6 @@
return( $this->getNumItems( $table, $cond ));
}
- /**
- * Returns how many links are under the given category.
- *
- * @param categoryId the category identifier.
- * @return The number of links under this category or 0 if none.
- */
- function getNumMyLinksCategory( $categoryId )
- {
- $prefix = $this->getPrefix();
- $table = "{$prefix}mylinks";
- $cond = "category_id = '".Db::qstr($categoryId)."';";
-
- return( $this->getNumItems( $table, $cond ));
- }
-
/**
* marks a category as updated now, changing the last_modfication field to
* NOW()
@@ -237,12 +185,14 @@
*/
function updateCategoryModificationDate( $categoryId )
{
- $query = "UPDATE ".$this->getPrefix()."mylinks_categories
- SET last_modification = NOW()
- WHERE id = '".Db::qstr( $categoryId )."'";
- $result = $this->Execute( $query );
-
- return $result;
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ $category = $this->getMyLinksCategory( $categoryId );
+ if( $category ) {
+ $category->setModificationDate( Timestamp::getNowTimestamp());
+ return( $this->update( $category ));
+ }
+ else
+ return false;
}
/**
@@ -250,19 +200,18 @@
*/
function updateLastModification( $categoryId , $lastModification)
{
- $query = "UPDATE ".$this->getPrefix()."mylinks_categories
- SET last_modification = '".Db::qstr( $lastModification )."'
- WHERE id = '".Db::qstr( $categoryId )."'";
- $result = $this->Execute( $query );
-
- return $result;
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ $category = $this->getMyLinksCategory( $categoryId );
+ if( $category ) {
+ $category->setLastModification( Timestamp::getNowTimestamp());
+ return( $this->update( $category ));
+ }
+ else
+ return false;
}
-
- /**
- * @private
- */
- function _fillMyLinksCategoryFromRow( $row )
- {
+
+ function mapRow( $row )
+ {
$myLinksCategory = new MyLinksCategory( $row["name"],
$row["blog_id"],
$row["num_links"],
@@ -270,8 +219,9 @@
$row["id"] );
$myLinksCategory->setLastModification( new Timestamp( $row["last_modification"] ));
+ $myLinksCategory->setNumLinks( $row["num_links"] );
return $myLinksCategory;
- }
+ }
}
-?>
+?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/dao/mylinkscategory.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/mylinkscategory.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/mylinkscategory.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -38,6 +38,16 @@
$this->setProperties( $properties );
$this->_lastModification = new Timestamp();
$this->_links = null;
+ $this->_numLinks = 0;
+
+ $this->_pk = "id";
+ $this->_fields = Array(
+ "name" => "getName",
+ "blog_id" => "getBlogId",
+ "last_modification" => "getLastModification",
+ "properties" => "getProperties",
+ "num_links" => "getNumLinks"
+ );
}
/**
@@ -162,5 +172,10 @@
{
return $this->_lastModification;
}
+
+ function setNumLinks( $numLinks )
+ {
+ $this->_numLinks = $numLinks;
+ }
}
?>
Modified: plog/branches/plog-1.1-daochanges/class/dao/trackback.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/trackback.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/trackback.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -25,10 +25,11 @@
* @param clientIp the IP address where the trackback is coming from
* @param id Identifier of this item.
*/
- function TrackBack( $url, $title, $articleId, $excerpt, $blogName, $date, $clientIp, $spamRate = 0, $status = COMMENT_STATUS_NONSPAM, $id = -1 )
+ function TrackBack( $url, $title, $articleId, $blogId, $excerpt, $blogName, $date, $clientIp, $spamRate = 0, $status = COMMENT_STATUS_NONSPAM, $id = -1 )
{
// initialize the UserComment object
$this->UserComment( $articleId,
+ $blogId,
0,
$title,
$excerpt,
Modified: plog/branches/plog-1.1-daochanges/class/dao/trackbacks.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/trackbacks.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/trackbacks.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -99,23 +99,10 @@
$date = $row["date"];
$articleId = $row["article_id"];
- // let's try and keep some kind of cache for this...
- if( empty($this->_blogSettings[$articleId])) {
- $query = "SELECT DISTINCT b.settings AS settings
- FROM {$prefix}blogs b, {$prefix}articles a,
- {$prefix}trackbacks t
- WHERE t.article_id = a.id AND
- a.blog_id = b.id
- AND a.id = $articleId";
- $result = $this->Execute( $query );
- $tmpRow = $result->FetchRow();
- $blogSettings = Blogs::getBlogSettingsFromField( $tmpRow["settings"] );
- $this->_blogSettings[$articleId] = $blogSettings;
- }
- else {
- $blogSettings = $this->_blogSettings[$articleId];
- }
-
+ $blogId = $row["blog_id"];
+ $blogs = new Blogs();
+ $blogInfo = $blogs->getBlogInfo( $blogId );
+ $blogSettings = $blogInfo->getSettings();
$timeDiff = $blogSettings->getValue( "time_offset" );
// now that we've got the time difference, we can
// calculate what would the "real" date...
@@ -147,16 +134,6 @@
return( CommentsCommon::getNumPostComments( $artId, $status, COMMENT_TYPE_TRACKBACK ));
}
- /**
- * Removes all the trackbacks from a post
- *
- * @param artId The article identifier
- */
- function deletePostTrackbacks( $artId )
- {
- return( CommentsCommon::deletePostComments( $artId, COMMENT_TYPE_TRACKBACK ));
- }
-
/**
* gets a single trackback from the db
* only used by the admin panel, no caching enabled
@@ -167,7 +144,7 @@
*/
function getArticleTrackback( $trackbackId, $articleId = -1 )
{
- return( CommentsCommon::getPostComment( $articleId, $trackbackId, COMMENT_TYPE_TRACKBACK ));
+ return( CommentsCommon::getPostComment( $trackbackId, $articleId, COMMENT_TYPE_TRACKBACK ));
}
/**
Modified: plog/branches/plog-1.1-daochanges/class/dao/usercomment.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/usercomment.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/usercomment.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -15,84 +15,26 @@
class UserComment extends DbObject
{
- /**
- * @private
- */
var $_id;
-
- /**
- * @private
- */
var $_artid;
-
- /**
- * @private
- */
var $_userName;
-
- /**
- * @private
- */
var $_userEmail;
-
- /**
- * @private
- */
var $_userUrl;
-
- /**
- * @private
- */
var $_topic;
-
- /**
- * @private
- */
var $_text;
-
- /**
- * @private
- */
var $_date;
-
- /**
- * @private
- */
var $_parentid;
-
- /**
- * @private
- */
var $_clientIp;
-
- /**
- * @private
- */
var $_timeStamp;
- /**
- * @private
- */
var $_postInfo;
-
- /**
- * @private
- */
var $_spamRate;
-
- /**
- * @private
- */
var $_status;
-
- /**
- * @private
- */
var $_type;
/**
* Creates a new user comment.
*/
- function UserComment( $artid, $parentid, $topic, $text, $date = null, $userName = "", $userEmail = "", $userUrl = "", $clientIp = "0.0.0.0", $spamRate = 0, $status = COMMENT_STATUS_NONSPAM, $id = -1 )
+ function UserComment( $artid, $blogId, $parentid, $topic, $text, $date = null, $userName = "", $userEmail = "", $userUrl = "", $clientIp = "0.0.0.0", $spamRate = 0, $status = COMMENT_STATUS_NONSPAM, $id = -1 )
{
$this->Object();
@@ -124,6 +66,27 @@
// by default, we've got a user comment instead of a trackback
$this->_type = COMMENT_TYPE_COMMENT;
+
+ $this->_blogId = $blogId;
+ $this->_sendNotification = false;
+
+ $this->_fields = Array(
+ "article_id" => "getArticleId",
+ "blog_id" => "getBlogId",
+ "topic" => "getTopic",
+ "text" => "getText",
+ "date" => "getDate",
+ "user_email" => "getUserEmail",
+ "user_url" => "getUserUrl",
+ "user_name" => "getUserName",
+ "parent_id" => "getParentId",
+ "client_ip" => "getClientIp",
+ "send_notification" => "getSendNotification",
+ "status" => "getStatus",
+ "spam_rate" => "getSpamRate",
+ "properties" => "getProperties",
+ "type" => "getType"
+ );
}
/**
@@ -439,5 +402,25 @@
{
$this->_type = $type;
}
+
+ function getSendNotification()
+ {
+ return( $this->_sendNotification );
+ }
+
+ function setSendNotification( $sendNotification )
+ {
+ $this->_sendNotification = $sendNotification;
+ }
+
+ function getBlogId()
+ {
+ return( $this->_blogId );
+ }
+
+ function setBlogId( $blogId )
+ {
+ $this->_blogId = $blogId;
+ }
}
?>
Modified: plog/branches/plog-1.1-daochanges/class/dao/userdata/baseuserdataprovider.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/userdata/baseuserdataprovider.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/userdata/baseuserdataprovider.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -104,7 +104,7 @@
$result = $this->Execute( $owner );
while( $row = $result->FetchRow($result)) {
- $usersBlogs[] = $blogs->_fillBlogInformation( $row );
+ $usersBlogs[] = $blogs->mapRow( $row );
$ids[] = $row["id"];
}
@@ -122,12 +122,17 @@
// now we know to which he or she belongs, so we only have
// to load the information about those blogs
while( $row = $result->FetchRow($result)) {
- $usersBlogs[] = $blogs->_fillBlogInformation( $row );
+ $usersBlogs[] = $blogs->mapRow( $row );
}
return $usersBlogs;
}
+ function mapRow( $row )
+ {
+ return( $this->_mapUserInfoObject( $row ));
+ }
+
/**
* @private
*/
Modified: plog/branches/plog-1.1-daochanges/class/dao/userdata/ploguserdataprovider.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/userdata/ploguserdataprovider.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/userdata/ploguserdataprovider.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -20,6 +20,8 @@
function PlogUserDataProvider( $providerConfig )
{
$this->BaseUserDataProvider( $providerConfig, true );
+
+ $this->table = $this->getPrefix()."users";
}
/**
@@ -32,19 +34,15 @@
*/
function authenticateUser( $user, $pass )
{
- $query = "SELECT * FROM ".$this->getPrefix()."users
- WHERE user = '".Db::qstr($user)."' AND password = '".md5($pass)."'
- AND status = '".USER_STATUS_ACTIVE."'";
-
- $result = $this->Execute( $query );
-
- if( $result == false )
- return false;
-
- if( $result->RecordCount() == 1 )
- return true;
- else
- return false;
+ $user = $this->getUserInfoFromUsername( $user );
+ if( $user ) {
+ return( $user->getPassword() == md5($pass));
+ print("now?");
+ }
+ else {
+ print("why not??");
+ return( false );
+ }
}
/**
@@ -72,28 +70,7 @@
*/
function getUserInfoFromUsername( $username )
{
- $userId = $this->_cache->getData( $username, CACHE_USERIDBYNAME );
-
- if ( !$userId ) {
- $prefix = $this->getPrefix();
- $query = "SELECT u.id AS id, u.user AS user, u.password AS password, u.email AS email,
- u.about AS about, u.full_name AS full_name, u.properties AS properties,
- u.resource_picture_id AS resource_picture_id,
- IF(p.permission_id = 1, 1, 0 ) AS site_admin,
- u.status AS status
- FROM {$prefix}users u LEFT JOIN {$prefix}users_permissions p ON u.id = p.user_id
- WHERE u.user = '".Db::qstr($username)."'";
- $userInfo = $this->_getUserInfoFromQuery( $query );
-
- if ( $userInfo ) {
- $this->_cache->setData( $userInfo->getUsername(), CACHE_USERIDBYNAME, $userInfo->getId() );
- $this->_cache->setData( $userInfo->getId(), CACHE_USERINFO, $userInfo );
- }
-
- return $userInfo;
- }
-
- return $this->getUserInfoFromId( $userId );
+ return( $this->get( "user", $username, CACHE_USERIDBYNAME, Array( CACHE_USERINFO => "getId" )));
}
/**
@@ -102,49 +79,12 @@
* @param userId User ID of the user from whom we'd like to get the information
* @return Returns a UserInfo object with the requested information, or false otherwise.
*/
- function getUserInfoFromId( $userid, $extendedInfo = false )
+ function getUserInfoFromId( $userid )
{
- $userInfo = $this->_cache->getData( $userid, CACHE_USERINFO );
- if ( !$userInfo ) {
- $prefix = $this->getPrefix();
- $query = "SELECT u.id AS id, u.user AS user, u.password AS password, u.email AS email,
- u.about AS about, u.full_name AS full_name, u.properties AS properties,
- u.resource_picture_id AS resource_picture_id,
- IF(p.permission_id = 1, 1, 0 ) AS site_admin,
- u.status AS status
- FROM {$prefix}users u LEFT JOIN {$prefix}users_permissions p ON u.id = p.user_id
- WHERE u.id = $userid";
-
- $userInfo = $this->_getUserInfoFromQuery( $query, $extendedInfo );
- $this->_cache->setData( $userid, CACHE_USERINFO, $userInfo );
- }
-
- return $userInfo;
+ return( $this->get( "id", $userid, CACHE_USERINFO, Array( CACHE_USERIDBYNAME => "getUsername" )));
}
-
+
/**
- * More common code used by several functions
- *
- * Private function used to fill in all the fields of UserInfo objects given
- * a row of the database.
- */
- function _getUserInfoFromQuery( $sql_query, $extendedInfo = false )
- {
- $result = $this->Execute( $sql_query );
- if( !$result )
- return false;
-
- if( $result->RowCount() == 0 )
- return false;
-
- $info = $result->FetchRow( $result );
-
- $userInfo = $this->_fillUserInformation( $info, $extendedInfo );
-
- return $userInfo;
- }
-
- /**
* Given a result record from a Execute call, it will fill in the
* fields of the object, so that we don't have to repeat the same
* code too many times
@@ -171,7 +111,7 @@
if( $searchTerms != "" )
$whereSearch = $this->buildSearchCondition( $searchTerms );
- $where = $this->buildWhereCondition( Array( $whereStatus, $whereSearch ));
+ $where = Db::buildWhereCondition( Array( $whereStatus, $whereSearch ));
$query = "SELECT * FROM ".$this->getPrefix()."users $where ORDER BY id ASC";
@@ -205,25 +145,20 @@
* user we would like to update.
* @return Returns true if ok or false otherwise.
*/
- function updateUser( $userInfo )
+ function updateUser( $user )
{
- $query = "UPDATE ".$this->getPrefix().
- "users SET email = '".$userInfo->getEmail().
- "', about = '".Db::qstr($userInfo->getAboutMyself()).
- "', password = '".$userInfo->getPassword().
- "', full_name = '".Db::qstr($userInfo->getFullName()).
- "', resource_picture_id = '".Db::qstr($userInfo->getPictureId()).
- "', properties = '".Db::qstr(serialize($userInfo->getProperties())).
- "', status = '".Db::qstr($userInfo->getStatus()).
- "' WHERE id = ".$userInfo->getId().";";
+ $result = $this->update( $user );
- // update the users table
- $result = $this->Execute( $query );
-
- $this->_cache->removeData( $userInfo->getId(), CACHE_USERINFO );
- $this->_cache->removeData( $userInfo->getUsername(), CACHE_USERIDBYNAME );
+ if( $userId ) {
+ // remove the old data
+ $this->_cache->removeData( $user->getId(), CACHE_USERINFO );
+ $this->_cache->removeData( $user->getUsername(), CACHE_USERIDBYNAME );
+ // and add the new one
+ $this->_cache->setData( $user->getId(), CACHE_USERINFO, $user );
+ $this->_cache->setData( $user->getUsername(), CACHE_USERIDBYNAME, $user->getId());
+ }
- BaseUserDataProvider::updateUser( $userInfo );
+ BaseUserDataProvider::updateUser( $user );
return $result;
}
@@ -237,25 +172,14 @@
*/
function addUser( &$user )
{
- $query = "INSERT INTO ".$this->getPrefix()."users(user,password,email,about,full_name,
- resource_picture_id,properties,status)
- VALUES ('".Db::qstr($user->getUserName())."','".md5($user->getPassword())."','".
- Db::qstr($user->getEmail())."','".Db::qstr($user->getAboutMyself())."','".
- Db::qstr($user->getFullName())."', '".
- Db::qstr($user->getPictureId())."', '".
- Db::qstr(serialize($user->getProperties()))."', '".
- Db::qstr($user->getStatus())."');";
+ $userId = $this->add( $user );
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- $userId = $this->_db->Insert_ID();
-
- $user->setId( $userId );
-
- return $userId;
+ if( $userId ) {
+ $this->_cache->setData( $user->getId(), CACHE_USERINFO, $user );
+ $this->_cache->setData( $user->getUsername(), CACHE_USERIDBYNAME, $user->getId());
+ }
+
+ return( $userId );
}
/**
@@ -309,19 +233,13 @@
*/
function disableUser( $userId )
{
- $query = "UPDATE ".$this->getPrefix()."users
- SET status = '".USER_STATUS_DISABLED."'
- WHERE id = '".Db::qstr($userId)."'";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- if( $this->_db->Affected_Rows() == 0 )
- return false;
-
- return true;
+ $user = $this->getUserInfoFromId( $userId );
+ if( $user ) {
+ $user->setStatus( USER_STATUS_DISABLED );
+ return( $this->updateUser( $user ));
+ }
+ else
+ return( false );
}
/**
@@ -332,23 +250,14 @@
function deleteUser( $userId )
{
// first, delete all of his/her permissions
- include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
- $perms = new UserPermissions();
- $perms->revokeUserPermissions( $userId );
-
- $query = "DELETE FROM ".$this->getPrefix()."users WHERE id = $userId;";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- if( $this->_db->Affected_Rows() == 0 )
- return false;
-
- $this->_cache->removeData( $userId, CACHE_USERINFO );
-
- return true;
+ if( $this->delete( $userId )) {
+ include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+ $perms = new UserPermissions();
+ $perms->revokeUserPermissions( $userId );
+ $this->_cache->removeData( $userId, CACHE_USERINFO );
+ }
+ else
+ return( false );
}
/**
Modified: plog/branches/plog-1.1-daochanges/class/dao/userinfo.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/dao/userinfo.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/dao/userinfo.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -40,6 +40,18 @@
// by defaults, users are in status "active"
$this->setStatus( USER_STATUS_ACTIVE );
+
+ $this->_pk = "id";
+ $this->_fields = Array(
+ "user" => "getUsername",
+ "password" => "getMD5Password",
+ "email" => "getEmail",
+ "full_name" => "getFullName",
+ "about" => "getAboutMyself",
+ "properties" => "getProperties",
+ "status" => "getStatus",
+ "resource_picture_id" => "getPictureId"
+ );
}
/**
@@ -54,6 +66,11 @@
{
return $this->_password;
}
+
+ function getMD5Password()
+ {
+ return( md5( $this->getPassword()));
+ }
function getId()
{
Modified: plog/branches/plog-1.1-daochanges/class/data/timestamp.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/data/timestamp.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/data/timestamp.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -358,6 +358,17 @@
}
/**
+ * returns the current time as a mysql timestamp
+ *
+ * @static
+ */
+ function getNowTimestamp()
+ {
+ $t = new Timestamp();
+ return( $t->getTimestamp());
+ }
+
+ /**
* returns an array with a range of years
*
* @param an array
Modified: plog/branches/plog-1.1-daochanges/class/database/db.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/database/db.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/database/db.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -8,7 +8,6 @@
include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
include_once( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
- //include_once( PLOG_CLASS_PATH."class/database/adodb/adodb.inc.php" );
include_once( PLOG_CLASS_PATH."class/database/pdb/pdb.class.php" );
/**
Modified: plog/branches/plog-1.1-daochanges/class/database/dbobject.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/database/dbobject.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/database/dbobject.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -11,83 +11,61 @@
*/
class DbObject extends Object
{
+ var $_table;
+ var $_pk;
+ var $_class;
+ var $_fields;
+ var $_properties;
- var $_properties;
-
- function DbObject()
- {
- $this->Object();
- $this->_properties = Array();
- }
-
- /**
- * assigns a generic value
- *
- * @param key
- * @param value
- * @return true
- */
- function setValue( $key, $value )
- {
- // make sure that we're dealing with an array here...
- if( !is_array($this->_properties))
- $this->_properties = Array();
-
- $this->_properties["$key"] = $value;
-
- return true;
- }
-
- /**
- * fetches a generic value
- *
- * @param key
- * @return the value associated to the key
- */
- function getValue( $key )
- {
- if( !is_array($this->_properties))
- return "";
-
- return $this->_properties["$key"];
- }
-
- /**
- * returns all the properties
- *
- * @return An array with the properties
- */
- function getProperties()
- {
- return $this->_properties;
- }
-
- /**
- * assigns all the properties at once
- *
- * @param properties An associative array
- * @return true
- */
- function setProperties( $properties )
- {
- $this->_properties = $properties;
- }
-
- /**
- * merges the current properties with the ones given
- * in the array passed as a parameter
- *
- * @param properties
- * @return True
- */
- function addProperties( $properties )
- {
- // simply loop through the array and see what we can find...
- foreach( $propertites as $key => $value ) {
- $this->setValue( $key, $value );
- }
-
- return true;
- }
+ function DbObject()
+ {
+ $this->Object();
+
+ $this->_table = null;
+ $this->_pk = null;
+ $this->_class = "DbObject";
+ $this->_fields = Array();
+ $this->_properties = Array();
+ }
+
+ function setValue( $key, $value )
+ {
+ $this->_properties["$key"] = $value;
+ }
+
+ function getValue( $key )
+ {
+ return( $this->_properties["$key"] );
+ }
+
+ function setProperties( $properties )
+ {
+ $this->_properties = $properties;
+ }
+
+ function getProperties()
+ {
+ return( $properties );
+ }
+
+ function getClass()
+ {
+ return( $this->_class );
+ }
+
+ function getPK()
+ {
+ return( $this->_pk );
+ }
+
+ function getFields()
+ {
+ return( array_keys( $this->_fields ));
+ }
+
+ function getFieldGetters()
+ {
+ return( $this->_fields );
+ }
}
?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/database/pdb/drivers/pdbdriverbase.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/database/pdb/drivers/pdbdriverbase.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/database/pdb/drivers/pdbdriverbase.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -11,13 +11,12 @@
* whether we're going to use paging or not.
*/
define( "DEFAULT_PAGING_ENABLED", -1 );
-
- /**
- * \ingroup PDb
- *
- * This class provides the base methods that all database drivers are expected to implement. Some methods
- * provide some common functionality that should be called even when the method is overwritten, so please make sure
- * to call the method of the parent class for those that need it.
+ /**
+ * \ingroup PDb
+ *
+ * This class provides the base methods that all database drivers are expected to implement. Some methods
+ * provide some common functionality that should be called even when the method is overwritten, so please make sure
+ * to call the method of the parent class for those that need it.
*/
class PDbDriverBase extends Object
{
@@ -25,16 +24,16 @@
var $_dbname;
var $_host;
var $_user;
- var $_password;
- var $_type = 'generic';
- var $nameQuote = '`';
- var $_debug = false;
+ var $_password;
+ var $_type = 'generic';
+ var $nameQuote = '`';
+ var $_debug = false;
var $_connected = false;
-
- /**
- * Generates a new instance of the driver. Please use PDb::getDriver() instead
- *
- * @see PDb::getDriver()
+
+ /**
+ * Generates a new instance of the driver. Please use PDb::getDriver() instead
+ *
+ * @see PDb::getDriver()
*/
function PDbDriverBase()
{
@@ -51,131 +50,129 @@
{
// to be implemented by child classes
}
-
- /**
- * Executes a query and returns a PDbResultSet as a result, or false if the query wasn't
- * successfully executed.
- *
- * This method must be implemented by database drivers.
- *
- * @param query A string with the query to execute
- * @param page Page of records, when using pagination. Leave empty if pagination is not needed.
- * @param itemsPerPage Amount of record per page, when using pagination.
- * @return A PDbResultSet object if successful or false otherwise
+
+ /**
+ * Executes a query and returns a PDbResultSet as a result, or false if the query wasn't
+ * successfully executed.
+ *
+ * This method must be implemented by database drivers.
+ *
+ * @param query A string with the query to execute
+ * @param page Page of records, when using pagination. Leave empty if pagination is not needed.
+ * @param itemsPerPage Amount of record per page, when using pagination.
+ * @return A PDbResultSet object if successful or false otherwise
*/
function Execute( $query, $page = DEFAULT_PAGING_ENABLED, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
// to be implemented by child classes
}
-
- /**
- * Starts a new connection to a databse
- *
- * Database drivers should call this method after providing their own implementation.
- *
- * @param host The host to which we're initiating the connection
- * @param username The username used to connecto the database
- * @param password Password assigned to the user above
- * @param dbname The name of the database to which we're connecting
- * @return Returns true if successful or false otherwise
+
+ /**
+ * Starts a new connection to a databse
+ *
+ * Database drivers should call this method after providing their own implementation.
+ *
+ * @param host The host to which we're initiating the connection
+ * @param username The username used to connecto the database
+ * @param password Password assigned to the user above
+ * @param dbname The name of the database to which we're connecting
+ * @return Returns true if successful or false otherwise
*/
function Connect( $host, $username, $password, $dbname = null )
{
$this->_host = $host;
$this->_username = $username;
$this->_password = $password;
- $this->_dbname = $dbname;
+ $this->_dbname = $dbname;
$this->_connected = true;
// extra functionality to be implemented by child classes...
}
-
- /**
- * Starts a new persistent connection to the database
- *
- * Database drivers should call this method after providing their own implementation.
- *
- * @param host The host to which we're initiating the connection
- * @param username The username used to connecto the database
- * @param password Password assigned to the user above
- * @param dbname The name of the database to which we're connecting
- * @return Returns true if successful or false otherwise
+ /**
+ * Starts a new persistent connection to the database
+ *
+ * Database drivers should call this method after providing their own implementation.
+ *
+ * @param host The host to which we're initiating the connection
+ * @param username The username used to connecto the database
+ * @param password Password assigned to the user above
+ * @param dbname The name of the database to which we're connecting
+ * @return Returns true if successful or false otherwise
*/
function PConnect( $host, $username, $password, $dbname )
{
$this->_host = $host;
$this->_username = $username;
$this->_password = $password;
- $this->_dbname = $dbname;
+ $this->_dbname = $dbname;
$this->_connected = true;
// extra functionality to be implemented by child classes...
}
-
- /**
- * Closes the current connection to the database
- *
- * This method must be implemented by database drivers.
- *
- * @return nothing
+ /**
+ * Closes the current connection to the database
+ *
+ * This method must be implemented by database drivers.
+ *
+ * @return nothing
*/
function Close()
{
// to be implemented by child classes
}
-
- /**
- * Returns the last error message that was generated by the driver
- *
- * This method must be implemented by database drivers.
- *
- * @return A string representing an error message, if any.
+
+ /**
+ * Returns the last error message that was generated by the driver
+ *
+ * This method must be implemented by database drivers.
+ *
+ * @return A string representing an error message, if any.
*/
function ErrorMsg()
{
// to be implemented by child classes
}
-
- /**
- * The row id as generated by the last INSERT operation.
- *
- * This method must be implemented by database drivers.
- *
- * @return A row id
+
+ /**
+ * The row id as generated by the last INSERT operation.
+ *
+ * This method must be implemented by database drivers.
+ *
+ * @return A row id
*/
function Insert_ID()
{
// to be implemented by child classes
}
-
- /**
- * Returns the number of rows affected by the last UPDATE, INSERT or DELETE operation.
- * Use PDbRecordSet::Row_Count() to retrieve the number of rows in a SELECT operation.
- *
- * This method must be implemented by database drivers.
- *
- * @return the number of affected rows
- * @see PDbRecordSet::Row_Count()
+
+ /**
+ * Returns the number of rows affected by the last UPDATE, INSERT or DELETE operation.
+ * Use PDbRecordSet::Row_Count() to retrieve the number of rows in a SELECT operation.
+ *
+ * This method must be implemented by database drivers.
+ *
+ * @return the number of affected rows
+ * @see PDbRecordSet::Row_Count()
*/
function Affected_Rows()
{
// to be implemented by child classes
- }
-
- /**
- * Returns true if the driver is currently connected to a database. Connections usually happen
- * after Connect or PConnect are called
- *
- * @return true if the driver is currently conneced or false otherwise
- * @see PDbDriverBase::PConnect()
- * @see PDbDriverBase::Connect()
- */
- function IsConnected()
- {
- return( $this->_connected );
}
/**
+ * Returns true if the driver is currently connected to a database. Connections usually happen
+ * after Connect or PConnect are called
+ *
+ * @return true if the driver is currently conneced or false otherwise
+ * @see PDbDriverBase::PConnect()
+ * @see PDbDriverBase::Connect()
+ */
+ function IsConnected()
+ {
+ return( $this->_connected );
+ }
+
+ /**
* @private
*/
function _debugQuery( $query )
@@ -186,11 +183,11 @@
return( true );
}
-
- /**
- * Activates the debug stuff.
- *
- * @param debug Whether debug should be enabled or not
+
+ /**
+ * Activates the debug stuff.
+ *
+ * @param debug Whether debug should be enabled or not
*/
function setDebug( $debug )
{
@@ -275,47 +272,47 @@
$queryPart = $columnName . ' ' . $operator . ' ';
$queryPart .= Db::quoteValue( $columnValue );
return $queryPart;
- }
-
- /**
- * for compatibility with ADOdb. Use Db::qstr() instead
- *
- * @private
- */
- function qstr( $string )
- {
- return( Db::qstr( $string ));
- }
-
- /**
- * Load the correct data dictionary driver. Child classes should overwrite this method
- * and provide the right driver name so that this method can be called without parameters.
- *
- * @param driverName the driver name.
- * @param A reference to the driver-specific PDbBaseDataDict object
- */
- function &getDriverDataDictionary( $driverName )
- {
- $dataDictPath = PLOG_CLASS_PATH."class/database/pdb/datadict/pdb{$driverName}datadict.class.php";
-
- // check if the driver exists at all
- if( !is_readable( $dataDictPath )) {
- throw( new Exception( "Cannot load data dictionary for driver $driverName!" ));
- die();
- }
-
- //print( "Loading datadict driver $dataDictPath...<br/>" );
-
- include_once( strtolower($dataDictPath));
-
- $className = "PDb{$driverName}DataDict";
- $class =& new $className();
-
- $class->dataProvider = $this;
- $class->connection = &$this;
-
- return( $class );
}
+
+ /**
+ * for compatibility with ADOdb. Use Db::qstr() instead
+ *
+ * @private
+ */
+ function qstr( $string )
+ {
+ return( Db::qstr( $string ));
+ }
+
+ /**
+ * Load the correct data dictionary driver. Child classes should overwrite this method
+ * and provide the right driver name so that this method can be called without parameters.
+ *
+ * @param driverName the driver name.
+ * @param A reference to the driver-specific PDbBaseDataDict object
+ */
+ function &getDriverDataDictionary( $driverName )
+ {
+ $dataDictPath = PLOG_CLASS_PATH."class/database/pdb/datadict/pdb{$driverName}datadict.class.php";
+
+ // check if the driver exists at all
+ if( !is_readable( $dataDictPath )) {
+ throw( new Exception( "Cannot load data dictionary for driver $driverName!" ));
+ die();
+ }
+
+ //print( "Loading datadict driver $dataDictPath...<br/>" );
+
+ include_once( strtolower($dataDictPath));
+
+ $className = "PDb{$driverName}DataDict";
+ $class =& new $className();
+
+ $class->dataProvider = $this;
+ $class->connection = &$this;
+
+ return( $class );
+ }
/**
* @param ttype can either be 'VIEW' or 'TABLE' or false.
@@ -365,9 +362,9 @@
}
/**
- * @returns an array with the primary key columns in it.
- *
- * @param table
+ * @returns an array with the primary key columns in it.
+ *
+ * @param table
* @param owner
*/
function MetaPrimaryKeys($table, $owner=false)
@@ -381,7 +378,7 @@
$p[] = $v->name;
}
}
- if (sizeof($p)) return $p;
+ if (sizeof($p)) return $p;
return false;
}
@@ -398,20 +395,19 @@
function &MetaColumns($table)
{
$rs = $this->Execute(sprintf("SHOW COLUMNS FROM %s",$table));
-
if (!is_object($rs))
- return false;
-
+ return false;
+
include_once( PLOG_CLASS_PATH."class/database/pdb/datadict/pdbfielddescobject.class.php" );
- $retarr = array();
- while( $row = $rs->FetchRow()) {
- $fld = new PDbFieldDescObject();
-
- //
- // :TODO:
- // Is this mysql-specific stuff?? If so, it should be moved to the Mysql driver!!
+ $retarr = array();
+ while( $row = $rs->FetchRow()) {
+ $fld = new PDbFieldDescObject();
+
//
+ // :TODO:
+ // Is this mysql-specific stuff?? If so, it should be moved to the Mysql driver!!
+ //
$fld->name = $row["Field"];
$type = $row["Type"];
@@ -444,7 +440,7 @@
}
}
- $retarr[strtoupper($fld->name)] = $fld;
+ $retarr[strtoupper($fld->name)] = $fld;
}
$rs->Close();
@@ -472,4 +468,4 @@
return $arr;
}
}
-?>
+?>
Modified: plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryalbum.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryalbum.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryalbum.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -1,7 +1,6 @@
<?php
include_once( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
/**
* \ingroup Gallery
@@ -58,7 +57,25 @@
$this->_numChildren = -1;
$this->_showAlbum = $showAlbum;
$this->_properties = $properties;
+
+ $this->_pk = "id";
+ $this->_fields = Array(
+ "owner_id" => "getOwnerId",
+ "description" => "getDescription",
+ "name" => "getName",
+ "flags" => "getFlags",
+ "parent_id" => "getParentId",
+ "date" => "getDate",
+ "properties" => "getProperties",
+ "show_album" => "getShowAlbum",
+ "mangled_name" => "getMangledName"
+ );
}
+
+ function setId( $id )
+ {
+ $this->_id = $id;
+ }
/**
* Returns the owner id
@@ -148,6 +165,7 @@
*/
function getTimestamp()
{
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
return new Timestamp($this->_date);
}
@@ -335,5 +353,11 @@
return true;
}
+
+ function getMangledName()
+ {
+ include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+ return( Textfilter::urlize( $this->getName()));
+ }
}
?>
Modified: plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryalbums.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryalbums.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryalbums.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -2,7 +2,7 @@
include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbum.class.php" );
- include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
+ include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
/**
* \ingroup Gallery
@@ -23,7 +23,6 @@
var $_childAlbums;
var $resources;
- var $_counts;
/**
* Constructor. Calls the Model constructor and does nothing more.
@@ -32,8 +31,8 @@
{
$this->Model();
$this->_childAlbums = Array();
- // to speed up things a bit...
- $this->_counts = null;
+
+ $this->table = $this->getPrefix()."gallery_albums";
}
/**
@@ -50,14 +49,26 @@
*/
function getUserAlbums( $ownerId, $onlyShownAlbums = false, $page = DEFAULT_PAGING_ENABLED, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
- $query = "SELECT id, owner_id, description,
- name, flags, parent_id,
- date, properties, show_album
- FROM ".$this->getPrefix()."gallery_albums WHERE owner_id = $ownerId";
- if( $onlyShownAlbums )
- $query .=" AND show_album = 1";
-
- return $this->_getAlbumsFromQuery( $query, $page, $itemsPerPage );
+ $albums = $this->getMany( "owner_id",
+ $ownerId,
+ CACHE_USERALBUMS,
+ Array( CACHE_GALLERYALBUM => "getId" ),
+ $page,
+ $itemsPerPage );
+ if( !$albums )
+ return false;
+
+ $result = Array();
+ if( $onlyShownAlbums ) {
+ foreach( $albums as $album ) {
+ if( $album->getShowAlbum())
+ $result[] = $album;
+ }
+ }
+ else
+ $result = $albums;
+
+ return( $result );
}
/**
@@ -79,25 +90,15 @@
*/
function getAlbum( $id, $ownerId = -1, $fetchResources = true, $onlyShownAlbums = false )
{
- // we might have this album in the memory cache already..
- if( isset($this->cache[$id])) {
- return $this->cache[$id];
- }
-
- // or in the global file cache..
- $album = $this->_cache->getData( $id, CACHE_GALLERYALBUM );
-
- if ( !$album || ($onlyShownAlbums && !$album->getShowAlbum()) ) {
- // otherwise, continue the normal process...
- $query = "SELECT * FROM ".$this->getPrefix()."gallery_albums WHERE id = $id";
- if( $ownerId != -1 )
- $query .= " AND owner_id = $ownerId";
- if( $onlyShownAlbums )
- $query .= " AND show_album = 1";
- $album = $this->_getAlbumFromQuery( $query );
- $this->_cache->setData( $id, CACHE_GALLERYALBUM, $album );
- }
- return $album;
+ $album = $this->get( "id", $id, CACHE_GALLERYALBUM, Array( CACHE_GALLERYALBUMBYNAME => "getMangledName" ));
+ if( !$album )
+ return false;
+ if( $ownerId > -1 && $album->getOwnerId() != $ownerId )
+ return false;
+ if( $onlyShownAlbums && !$album->getShowAlbum())
+ return false;
+
+ return( $album );
}
/**
@@ -119,43 +120,17 @@
*/
function getAlbumByName( $id, $ownerId = -1, $fetchResources = true, $onlyShownAlbums = false )
{
- // otherwise, continue the normal process...
- $query = "SELECT id, owner_id, description,
- name, flags, parent_id,
- date, properties, show_album
- FROM ".$this->getPrefix()."gallery_albums
- WHERE mangled_name = '".Db::qstr($id)."'";
- if( $ownerId != -1 )
- $query .= " AND owner_id = $ownerId";
- if( $onlyShownAlbums )
- $query .= " AND show_album = 1";
-
- return $this->_getAlbumFromQuery( $query );
+ $album = $this->get( "mangled_name", $id, CACHE_GALLERYALBUMBYNAME, Array( CACHE_GALLERYALBUM => "getId" ));
+ if( !$album )
+ return false;
+ if( $ownerId > -1 && $album->getOwnerId() != $ownerId )
+ return false;
+ if( $onlyShownAlbums && !$album->getShowAlbum())
+ return false;
+
+ return( $album );
}
- /**
- * @private
- */
- function _getAlbumFromQuery( $query )
- {
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- if( $result->RowCount() == 0 )
- return false;
-
- $row = $result->FetchRow();
- $album = $this->_fetchAlbumInformation( $row, $fetchResources, $onlyShownAlbums );
-
- // ...and keep a copy of the object we just fetched
- // just in case, one never knows :)
- $this->cache[$id] = $album;
-
- return $album;
- }
-
/**
* Returns an array with all the child albums of the given album, but only
* the ones at the first level (it is not recursive!)
@@ -167,72 +142,32 @@
* @return An array of GalleryAlbum objects
*/
function getChildAlbums( $albumId, $ownerId, $onlyShownAlbums = false )
- {
- $query = "SELECT id, owner_id, description,
- name, flags, parent_id,
- date, properties, show_album
- FROM ".$this->getPrefix()."gallery_albums
- WHERE parent_id = $albumId AND
- owner_id = $ownerId";
- if( $onlyShownAlbums )
- $query .= " AND show_album = 1";
-
- return $this->_getAlbumsFromQuery( $query );
+ {
+ $albums = $this->getUserAlbums( $ownerId, $onlyShownAlbums );
+ if( !$albums )
+ return false;
+ $result = Array();
+ foreach( $albums as $album ) {
+ if( $album->getParentId() == $albumId )
+ $result[] = $album;
+ }
+
+ return( $album );
}
/**
- * @private
- * @see getUserAlbums
- */
- function _getAlbumsFromQuery( $query, $page = DEFAULT_PAGING_ENABLED, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
- {
- $result = $this->Execute( $query, $page, $itemsPerPage );
-
- // return empty array if the query didn't succeed
- if( !$result )
- return Array();
-
- $albums = Array();
- while( $row = $result->FetchRow()) {
- array_push( $albums, $this->_fetchAlbumInformation( $row ));
- }
-
- return $albums;
- }
-
- /**
* Adds an album to the database
*
* @param album A GalleryAlbum object, with all its data filled in
* @return Returns true if successful or false otherwise.
* @see GAlleryAlbum
*/
- function addAlbum( $album )
- {
- include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- $tf = new Textfilter();
- $query = "INSERT INTO ".$this->getPrefix()."gallery_albums (
- owner_id, description, name, flags, parent_id, properties,
- show_album, normalized_name, normalized_description, mangled_name )
- VALUES (".
- $album->getOwnerId().", '".Db::qstr($album->getDescription())."', '".
- Db::qstr($album->getName())."', 0, ".$album->getParentId().", '".
- serialize($album->getProperties())."', 1,'".
- Db::qstr($tf->normalizeText($album->getName()))."','".
- Db::qstr($tf->normalizeText($album->getDescription()))."', '".
- $tf->urlize($album->getName())."');";
-
- $result = $this->Execute( $query );
+ function addAlbum( &$album )
+ {
+ if(( $result = $this->add( $album ))) {
+ $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS );
+ }
- if( !$result )
- return false;
-
- // return the id of the last row we inserted, which will be the id of the album
- $result = $this->_db->Insert_ID();
-
- // remove the cached album hierarchy array
- $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS );
-
return $result;
}
@@ -264,26 +199,15 @@
return false;
}
- include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- $tf = new TextFilter();
- $query = "UPDATE ".$this->getPrefix()."gallery_albums SET
- description = '".Db::qstr($album->getDescription())."',
- name = '".Db::qstr($album->getName())."',
- parent_id = ".$album->getParentId().",
- properties = '".serialize($album->getProperties())."',
- show_album = ".$album->getShowAlbum().",
- normalized_name = '".Db::qstr($tf->normalizeText($album->getName()))."',
- normalized_description = '".Db::qstr($tf->normalizeText($album->getDescription()))."',
- mangled_name = '".$tf->urlize($album->getName())."'
- WHERE id = ".$album->getId().";";
+ $result = $this->update( $album );
+ if( $result ) {
+ // remove the album from the cache
+ $this->_cache->removeData( $album->getId(), CACHE_GALLERYALBUM );
+ // and remove the cached album hierarchy array
+ $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS );
+ }
- // remove the album from the cache
- $this->_cache->removeData( $album->getId(), CACHE_GALLERYALBUM );
-
- // and remove the cached album hierarchy array
- $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS );
-
- return $this->Execute( $query );
+ return( $result );
}
/**
@@ -299,70 +223,21 @@
// too bad we need to load the album before deleting it, but this method
// won't get called all to often anyway :)
$album = $this->getAlbum( $albumId );
+ if( $album )
+ return false;
+
+ if( $userId > -1 )
+ if( $album->getOwnerId() != $userId )
+ return false;
+
+ $this->delete( "id", $albumId );
$this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS );
-
- $query = "DELETE FROM ".$this->getPrefix()."gallery_albums
- WHERE id = $albumId";
- if( $userId != -1 )
- $query .= " AND owner_id = $userId";
-
- // remove the album from the cache
- $this->_cache->removeData( $albumId, CACHE_GALLERYALBUM );
-
- return $this->Execute( $query );
+ $this->delete( "parent_id", $album->getId());
+
+ return( true );
}
-
- /**
- * @private
- */
- function _getNumResourcesOld( $albumId )
- {
- $query = "SELECT COUNT(*) AS total FROM ".$this->getPrefix()."gallery_resources
- WHERE album_id = $albumId";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return 0;
-
- $row = $result->FetchRow();
-
- if( $row["total"] == "" )
- return 0;
- else
- return $row["total"];
- }
/**
- * @private
- * Alternative version as the above, faster when loading lots of albums
- */
- function _getNumResources( $albumId )
- {
- // if we haven't loaded them all yet...
- $prefix = $this->getPrefix();
- if( $this->_counters == null ) {
- $query = "SELECT album_id, COUNT(*) AS total FROM {$prefix}gallery_resources GROUP BY album_id";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return 0;
-
- while( $row = $result->FetchRow()) {
- $id = $row["album_id"];
- $this->_counters[$id] = $row["total"];
- }
- }
-
- $total = $this->_counters[$albumId];
-
- if( $total == "" ) $total = 0;
-
- return $total;
- }
-
- /**
* returns how many albums this user has
*
* @param userId The number of albums that this user has
@@ -464,13 +339,10 @@
}
return $results;
- }
-
- /**
- * @private
- */
- function _fetchAlbumInformation( $row, $fetchResources = true, $onlyShownAlbums = false )
- {
+ }
+
+ function mapRow( $row )
+ {
$album = new GalleryAlbum( $row["owner_id"],
$row["name"],
$row["description"],
@@ -481,19 +353,14 @@
$row["show_album"],
$row["id"] );
- // fetch the number of children and the GalleryAlbum child
- // objects that "hang" from this one
- //$album->setNumChildren( $this->getNumChildren($row["id"]));
$id = $row["id"];
$ownerId = $row["owner_id"];
- if( !isset($this->_childAlbums[$id])) {
+ /*if( !isset($this->_childAlbums[$id])) {
$this->_childAlbums[$id] = $this->getChildAlbums( $id, $ownerId );
- }
+ }*/
$album->setChildren( $this->_childAlbums[$id] );
-
- $album->setNumResources( $this->_getNumResources( $id ));
-
+ $album->setNumResources( $row['num_resources'] );
return $album;
- }
+ }
}
?>
Modified: plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresource.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresource.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresource.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -73,6 +73,21 @@
$this->_date = $date;
$this->_thumbnailFormat = $thumbnailFormat;
$this->_id = $id;
+
+ $this->_fields = Array(
+ "owner_id" => "getOwnerId",
+ "album_id" => "getAlbumId",
+ "description" => "getDescription",
+ "date" => "getDate",
+ "flags" => "getFlags",
+ "resource_type" => "getResourceType",
+ "file_path" => "getFilePath",
+ "file_name" => "getFileName",
+ "thumbnail_format" => "getThumbnailFormat",
+ "normalized_description" => "getNormalizedDescription",
+ "properties" => "getProperties",
+ "metadata" => "getMetadata"
+ );
}
/**
@@ -435,6 +450,13 @@
}
}
+ function getNormalizedDescription()
+ {
+ include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+ $tf = new Textfilter();
+ return( $tf->normalizeText( $this->getDescription()));
+ }
+
/**
* @return true if the resource is an image
*/
Modified: plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresourcequotas.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresourcequotas.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresourcequotas.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -92,7 +92,8 @@
function getBlogResourceQuota( $blogId )
{
$blogs = new Blogs();
- $blogSettings = $blogs->getBlogSettings( $blogId );
+ $blogInfo = $blogs->getBlogInfo( $blogId );
+ $blogSettings = $blogInfo->getSettings();
$blogQuota = $blogSettings->getValue( "resources_quota" );
if( $blogQuota == "" )
Modified: plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresources.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresources.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/gallery/dao/galleryresources.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -70,9 +70,9 @@
{
$this->Model();
- $this->albums = new GalleryAlbums();
-
- //$this->_db->debug=true;
+ $this->albums = new GalleryAlbums();
+
+ $this->table = $this->getPrefix()."gallery_resources";
}
/**
@@ -85,28 +85,14 @@
*/
function getResource( $resourceId, $ownerId = -1, $albumId = -1 )
{
- $resource = $this->_cache->getData( $resourceId, CACHE_RESOURCES );
+ $resource = $this->get( "id", $resourceId, CACHE_RESOURCES );
- if( !$resource ) {
- $query = "SELECT * FROM ".$this->getPrefix()."gallery_resources
- WHERE id = $resourceId";
- if( $ownerId > 0 )
- $query .= " AND owner_id = $ownerId";
- if( $albumId > 0 )
- $query .=" AND album_id = $albumId";
-
- $result = $this->Execute( $query );
-
- if( !$result )
- return false;
-
- if( $result->RecordCount() == 0 )
- return false;
-
- $row = $result->FetchRow();
- $resource = $this->_fillResourceInformation( $row );
- $this->_cache->setData( $resourceId, CACHE_RESOURCES, $resource );
- }
+ if( !$resource )
+ return false;
+ if( $ownerId > -1 && $resource->getOwnerId() != $ownerId )
+ return false;
+ if( $albumId > -1 && $resource->getAlbumId() != $albumId )
+ return false;
return $resource;
}
@@ -140,8 +126,10 @@
return false;
$row = $result->FetchRow();
- $resource = $this->_fillResourceInformation( $row );
+ $resource = $this->mapRow( $row );
+ $this->_cache->setData( $resource->getId(), CACHE_RESOURCES, $resource );
+
return $resource;
}
@@ -174,8 +162,10 @@
return false;
$row = $result->FetchRow();
- $resource = $this->_fillResourceInformation( $row );
+ $resource = $this->mapRow( $row );
+ $this->_cache->setData( $resource->getId(), CACHE_RESOURCES, $resource );
+
return $resource;
}
@@ -241,6 +231,7 @@
}
array_push( $resources, $res );
+ $this->_cache->setData( $res->getId(), CACHE_RESOURCES, $res );
}
return $resources;
@@ -615,7 +606,7 @@
$row = $result->FetchRow();
- return $this->_fillResourceInformation( $row );
+ return $this->mapRow( $row );
}
/**
@@ -627,30 +618,7 @@
*/
function updateResource( $resource )
{
- include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- $tf = new TextFilter();
- $query = "UPDATE ".$this->getPrefix()."gallery_resources
- SET album_id = ".$resource->getAlbumId().",
- description = '".Db::qstr($resource->getDescription())."',
- flags = ".$resource->getFlags().",
- resource_type = ".$resource->getResourceType().",
- file_path = '".$resource->getFilePath()."',
- file_name = '".$resource->getFileName()."',
- metadata = '".Db::qstr(serialize($resource->getMetadata()))."',
- thumbnail_format ='".$resource->getThumbnailFormat()."',
- date = '".$resource->getDate()."',
- normalized_description = '".Db::qstr($tf->normalizeText( $resource->getDescription()))."'
- WHERE id = ".$resource->getId();
-
- $result = $this->Execute( $query );
-
- // clear the cache
- $this->_cache->removeData( $resource->getId(), CACHE_RESOURCES );
-
- if( !$result )
- return false;
- else
- return true;
+ return( $this->update( $resource ));
}
/**
@@ -664,26 +632,17 @@
{
// first, get informaiton abotu the resource
$resource = $this->getResource( $resourceId, $ownerId );
-
- // now, remove it from the db
- $query = "DELETE FROM ".$this->getPrefix()."gallery_resources
- WHERE id = $resourceId";
- if( $ownerId > 0 )
- $query .= " AND owner_id = $ownerId";
-
- $result = $this->Execute( $query );
-
- // clear the cache
- $this->_cache->removeData( $resourceId, CACHE_RESOURCES );
-
- // if there was an error, we quit here
- if( !$result )
+ if( $resource ) {
+ $this->delete( "id", $resourceId );
+ $this->_cache->removeData( $resourceId, CACHE_RESOURCES );
+ // otherwise, proceed and remove the file from disk
+ include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+ $storage = new GalleryResourceStorage();
+ return $storage->remove( $resource );
+ }
+ else {
return false;
-
- // otherwise, proceed and remove the file from disk
- include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
- $storage = new GalleryResourceStorage();
- return $storage->remove( $resource );
+ }
}
/**
@@ -732,7 +691,7 @@
/**
* @private
*/
- function _fillResourceInformation( $row )
+ function mapRow( $row )
{
$res = new GalleryResource( $row["owner_id"],
$row["album_id"],
@@ -747,11 +706,11 @@
$row["id"] );
// we should also try to get some information about
- // to which album this resource belongs
+ // to which album this resource belongs
$album = $this->albums->getAlbum( $row["album_id"], $row["owner_id"], false );
$res->setAlbum( $album );
return $res;
}
}
-?>
+?>
\ No newline at end of file
Modified: plog/branches/plog-1.1-daochanges/class/locale/locales.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/locale/locales.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/locale/locales.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -200,11 +200,11 @@
*/
function getLocales()
{
- $localeCodes = Locales::getAvailableLocales();
+ $localeCodes = Locales::getAvailableLocales();
$locales = Array();
foreach( $localeCodes as $code ) {
- array_push( $locales, new Locale( $code ));
+ array_push( $locales, Locales::getLocale( $code ));
}
return $locales;
Modified: plog/branches/plog-1.1-daochanges/class/plugin/pluginbase.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/plugin/pluginbase.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/plugin/pluginbase.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -154,24 +154,6 @@
$this->userInfo = $userInfo;
}
- /**
- * Saves the blog settings back to the database so that they are permanent. This function
- * can be called anytime but it is specially useful from inside the config() method,
- * when the user has just configured something in the admin interface
- *
- * @return Returns true if the settings were saved ok or false otherwise.
- */
- function updateBlogSettings()
- {
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
- $blogs = new Blogs();
-
- $result = $blogs->updateBlogSettings( $this->blogInfo->getId(), $this->blogSettings);
-
- return $result;
- }
-
/**
* Changes the folder where plugins are loaded from
*
Modified: plog/branches/plog-1.1-daochanges/class/summary/action/activeaccountaction.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/summary/action/activeaccountaction.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/summary/action/activeaccountaction.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -49,7 +49,7 @@
$blogs = new Blogs();
$blog = $blogs->getBlogInfo($blogId);
$blog->setStatus(BLOG_STATUS_ACTIVE);
- $blogs->updateBlog($blogId,$blog);
+ $blogs->updateBlog($blog);
$blogUrl = $blog->getBlogRequestGenerator();
// create the message that we're going to show
Modified: plog/branches/plog-1.1-daochanges/class/template/templatesets/templatesets.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/template/templatesets/templatesets.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/template/templatesets/templatesets.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -103,7 +103,8 @@
function getBlogTemplates( $blogId )
{
$blogs = new Blogs();
- $blogSettings = $blogs->getBlogSettings( $blogId );
+ $blogInfo = $blogs->getBlogInfo( $blogId );
+ $blogSettings = $blogInfo->getSettings();
$templates = $blogSettings->getValue( "blog_templates" );
Modified: plog/branches/plog-1.1-daochanges/class/template/templatesets/templatesetstorage.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/template/templatesets/templatesetstorage.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/template/templatesets/templatesetstorage.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -158,6 +158,8 @@
*/
function removeBlogTemplate( $templateName, $blogId )
{
+ die("removeBlogTemplate: FIXME!!!");
+
$config =& Config::getConfig();
// get the settings of this blog
@@ -279,8 +281,11 @@
*/
function addLocalTemplate( $templateName, $blogId )
{
+ die("addLocaleTemplatemplate: FIXME!!!");
+
$blogs = new Blogs();
- $blogSettings = $blogs->getBlogSettings( $blogId );
+ $blog = $blogs->getBlogInfo( $blogId );
+ $blogSettings = $blog->getBlogSettings();
if( $blogSettings == "" || $blogSettings == false )
return false;
Modified: plog/branches/plog-1.1-daochanges/class/view/admin/adminarticlecategorieslistview.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/view/admin/adminarticlecategorieslistview.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/view/admin/adminarticlecategorieslistview.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -40,12 +40,12 @@
// retrieve the categories in an paged fashion
$totalCategories = $categories->getBlogNumCategories( $this->_blogInfo->getId(), true, $this->_searchTerms );
- $blogCategories = $categories->getBlogCategoriesAdmin( $this->_blogInfo->getId(),
- false,
- $categoriesOrder,
- $this->_searchTerms,
- $this->_page,
- DEFAULT_ITEMS_PER_PAGE );
+ $blogCategories = $categories->getBlogCategories( $this->_blogInfo->getId(),
+ false,
+ $categoriesOrder,
+ $this->_searchTerms,
+ $this->_page,
+ DEFAULT_ITEMS_PER_PAGE );
if( !$blogCategories ) {
$blogCategories = Array();
}
Modified: plog/branches/plog-1.1-daochanges/class/view/admin/adminblogcategorieslistview.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/view/admin/adminblogcategorieslistview.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/view/admin/adminblogcategorieslistview.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -41,11 +41,11 @@
$blogCategories = $categories->getBlogCategories( $this->_page, DEFAULT_ITEMS_PER_PAGE );
if( !$blogCategories ) {
$blogCategories = Array();
- }
+ }
// throw the even in case somebody's waiting for it!
- $this->notifyEvent( EVENT_BLOG_CATEGORIES_LOADED, Array( "categories" => &$blogCategories ));
- $this->setValue( "categories", $blogCategories );
+ $this->notifyEvent( EVENT_BLOG_CATEGORIES_LOADED, Array( "blogcategories" => &$blogCategories ));
+ $this->setValue( "blogcategories", $blogCategories );
// the pager that will be used
$pager = new Pager( "?op=editBlogCategories&page=",
@@ -54,6 +54,8 @@
DEFAULT_ITEMS_PER_PAGE );
$this->setValue( "pager", $pager );
+
+
parent::render();
}
}
Modified: plog/branches/plog-1.1-daochanges/class/view/admin/adminblogsettingsview.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/view/admin/adminblogsettingsview.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/view/admin/adminblogsettingsview.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -18,8 +18,7 @@
{
$this->AdminTemplatedView( $blogInfo, "blogsettings" );
- $blogs = new Blogs();
- $blogSettings = $blogs->getBlogSettings( $this->_blogInfo->getId());
+ $blogSettings = $blogInfo->getSettings();
$this->setValue( "blogAbout", $this->_blogInfo->getAbout());
$this->setValue( "blogName", $this->_blogInfo->getBlog());
$this->setValue( "blogLocale", $blogSettings->getValue( "locale" ));
Modified: plog/branches/plog-1.1-daochanges/class/view/admin/adminnewpostview.class.php
===================================================================
--- plog/branches/plog-1.1-daochanges/class/view/admin/adminnewpostview.class.php 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/class/view/admin/adminnewpostview.class.php 2005-07-27 21:47:23 UTC (rev 2371)
@@ -5,6 +5,7 @@
include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
/**
* \ingroup View
Modified: plog/branches/plog-1.1-daochanges/templates/admin/blogcategories.template
===================================================================
--- plog/branches/plog-1.1-daochanges/templates/admin/blogcategories.template 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/templates/admin/blogcategories.template 2005-07-27 21:47:23 UTC (rev 2371)
@@ -18,21 +18,21 @@
</tr>
</thead>
<tbody>
- {foreach from=$categories item=category}
+ {foreach from=$blogcategories item=blogcategory}
<tr class="{cycle values="odd, even"}">
<td>
- <input class="checkbox" type="checkbox" name="categoryIds[{counter}]" id="checks_{$category->getId()}" value="{$category->getId()}" />
+ <input class="checkbox" type="checkbox" name="categoryIds[{counter}]" id="checks_{$blogcategory->getId()}" value="{$blogcategory->getId()}" />
</td>
<td class="col_highlighted">
- <a href="admin.php?op=editBlogCategory&categoryId={$category->getId()}">{$category->getName()}</a>
+ <a href="admin.php?op=editBlogCategory&categoryId={$blogcategory->getId()}">{$blogcategory->getName()}</a>
</td>
<td>
- {$category->getNumBlogs()}
+ {$blogcategory->getNumBlogs()}
</td>
<td>
<div class="list_action_button">
- <a href="?op=editBlogCategory&categoryId={$category->getId()}"><img src="imgs/admin/icon_edit-16.png" alt="{$locale->tr("edit")}" /></a>
- <a href="?op=deleteBlogCategory&categoryId={$category->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
+ <a href="?op=editBlogCategory&categoryId={$blogcategory->getId()}"><img src="imgs/admin/icon_edit-16.png" alt="{$locale->tr("edit")}" /></a>
+ <a href="?op=deleteBlogCategory&categoryId={$blogcategory->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
</div>
</td>
</tr>
Modified: plog/branches/plog-1.1-daochanges/templates/admin/blogtemplatechooser.template
===================================================================
--- plog/branches/plog-1.1-daochanges/templates/admin/blogtemplatechooser.template 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/templates/admin/blogtemplatechooser.template 2005-07-27 21:47:23 UTC (rev 2371)
@@ -4,8 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
<link rel="stylesheet" href="styles/admin.css" type="text/css" />
<title>{$locale->tr("admin_interface_title")}</title>
- <script type="text/javascript" src="js/xinha/popups/popup.js"></script>
- <script type="text/javascript" src="js/xinha/htmlarea-plog-resourcelist.js"></script>
+ <script type="text/javascript" src="js/htmlarea/popups/popup.js"></script>
+ <script type="text/javascript" src="js/htmlarea/htmlarea-plog-resourcelist.js"></script>
<script type="text/javascript" src="js/ui/common.js"></script>
<script type="text/javascript">
var plogBaseUrl = '{$baseurl}';
Modified: plog/branches/plog-1.1-daochanges/templates/admin/dashboard.template
===================================================================
--- plog/branches/plog-1.1-daochanges/templates/admin/dashboard.template 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/templates/admin/dashboard.template 2005-07-27 21:47:23 UTC (rev 2371)
@@ -162,14 +162,6 @@
{$blog->getTotalTrackbacks()}
</td>
</tr>
- <tr style="background-color: {cycle values="#FFFFFF,#F7F7F7"};">
- <th>
- {$locale->tr("total_viewed")}:
- </th>
- <td>
- {$blog->getViewedTotal()}
- </td>
- </tr>
</table>
</td>
</tr>
Modified: plog/branches/plog-1.1-daochanges/templates/admin/editlinks.template
===================================================================
--- plog/branches/plog-1.1-daochanges/templates/admin/editlinks.template 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/templates/admin/editlinks.template 2005-07-27 21:47:23 UTC (rev 2371)
@@ -49,8 +49,9 @@
<td><a href="{$link->getUrl()}">{$link->getUrl()}</a></td>
{assign var=linkcategory value=$link->getCategoryId()}
<td>
- <a href="admin.php?op=editLinks&showCategory={$linkscategories[$linkcategory]->getId()}">
- {$linkscategories[$linkcategory]->getName()}
+ {assign var=linkcategory value=$link->getMyLinkCategory()}
+ <a href="admin.php?op=editLinks&showCategory={$linkcategory->getId()}">
+ {$linkcategory->getName()}
</a>
</td>
<td>
Modified: plog/branches/plog-1.1-daochanges/templates/admin/editpost.template
===================================================================
--- plog/branches/plog-1.1-daochanges/templates/admin/editpost.template 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/templates/admin/editpost.template 2005-07-27 21:47:23 UTC (rev 2371)
@@ -7,11 +7,10 @@
var indexPage = "{$config->getValue("script_name")}";
</script>
{if $htmlarea}
- <link rel="stylesheet" href="js/xinha/htmlarea.css" type="text/css"/>
- <script type="text/javascript" src="js/xinha/htmlarea.js"/></script>
- <script type="text/javascript" src="js/xinha/dialog.js"/></script>
- <script type="text/javascript" src="js/xinha/htmlarea-plog.js"/></script>
- <link type="text/css" rel="stylesheet" title="blue-look" href="js/xinha/skins/blue-look/skin.css">
+ <link rel="stylesheet" href="js/htmlarea/htmlarea.css" type="text/css"/>
+ <script type="text/javascript" src="js/htmlarea/htmlarea.js"/></script>
+ <script type="text/javascript" src="js/htmlarea/dialog.js"/></script>
+ <script type="text/javascript" src="js/htmlarea/htmlarea-plog.js"/></script>
{else}
<link rel="stylesheet" href="js/editor/plogeditor.css" type="text/css" />
<script type="text/javascript" src="js/editor/plogeditor.js"></script>
Modified: plog/branches/plog-1.1-daochanges/templates/admin/newpost.template
===================================================================
--- plog/branches/plog-1.1-daochanges/templates/admin/newpost.template 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/templates/admin/newpost.template 2005-07-27 21:47:23 UTC (rev 2371)
@@ -7,11 +7,10 @@
var indexPage = "{$config->getValue("script_name")}";
</script>
{if $htmlarea}
- <link rel="stylesheet" href="js/xinha/htmlarea.css" type="text/css"/>
- <script type="text/javascript" src="js/xinha/htmlarea.js"/></script>
- <script type="text/javascript" src="js/xinha/dialog.js"/></script>
- <script type="text/javascript" src="js/xinha/htmlarea-plog.js"/></script>
- <link type="text/css" rel="stylesheet" title="blue-look" href="js/xinha/skins/blue-look/skin.css">
+ <link rel="stylesheet" href="js/htmlarea/htmlarea.css" type="text/css"/>
+ <script type="text/javascript" src="js/htmlarea/htmlarea.js"/></script>
+ <script type="text/javascript" src="js/htmlarea/dialog.js"/></script>
+ <script type="text/javascript" src="js/htmlarea/htmlarea-plog.js"/></script>
{else}
<link rel="stylesheet" href="js/editor/plogeditor.css" type="text/css" />
<script type="text/javascript" src="js/editor/plogeditor.js"></script>
Modified: plog/branches/plog-1.1-daochanges/templates/admin/resourcelist.template
===================================================================
--- plog/branches/plog-1.1-daochanges/templates/admin/resourcelist.template 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/templates/admin/resourcelist.template 2005-07-27 21:47:23 UTC (rev 2371)
@@ -4,8 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
<link rel="stylesheet" href="styles/admin.css" type="text/css" />
<title>pLog Admin</title>
- <script type="text/javascript" src="js/xinha/popups/popup.js"></script>
- <script type="text/javascript" src="js/xinha/htmlarea-plog-resourcelist.js"></script>
+ <script type="text/javascript" src="js/htmlarea/popups/popup.js"></script>
+ <script type="text/javascript" src="js/htmlarea/htmlarea-plog-resourcelist.js"></script>
<script type="text/javascript" src="js/ui/common.js"></script>
<script type="text/javascript">
var plogBaseUrl = '{$baseurl}';
Modified: plog/branches/plog-1.1-daochanges/templates/admin/userpictureselect.template
===================================================================
--- plog/branches/plog-1.1-daochanges/templates/admin/userpictureselect.template 2005-07-27 19:56:15 UTC (rev 2370)
+++ plog/branches/plog-1.1-daochanges/templates/admin/userpictureselect.template 2005-07-27 21:47:23 UTC (rev 2371)
@@ -4,8 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
<link rel="stylesheet" href="styles/admin.css" type="text/css" />
<title>{$locale->tr("admin_interface_title")}</title>
- <script type="text/javascript" src="js/xinha/popups/popup.js"></script>
- <script type="text/javascript" src="js/xinha/htmlarea-plog-resourcelist.js"></script>
+ <script type="text/javascript" src="js/htmlarea/popups/popup.js"></script>
+ <script type="text/javascript" src="js/htmlarea/htmlarea-plog-resourcelist.js"></script>
<script type="text/javascript" src="js/ui/common.js"></script>
<script type="text/javascript">
var plogBaseUrl = '{$baseurl}';
More information about the pLog-svn
mailing list