Update of /cvsroot/roller/roller/src/org/roller/business/castor
In directory sc8-pr-cvs1:/tmp/cvs-serv15067/src/org/roller/business/castor
Modified Files:
RefererManagerImpl.java UserManagerImpl.java
WeblogManagerImpl.java
Log Message:
Finally rolleruser.userEnabled means something. Dis-enabled user's
website/blogs won't be displayed (the big 404) nor will they have permission to
use the editor (how this looks will depend on how you configure your servlet
container).
Index: RefererManagerImpl.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/business/castor/RefererManagerImpl.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** RefererManagerImpl.java 25 May 2003 13:11:09 -0000 1.32
--- RefererManagerImpl.java 26 Jun 2003 17:11:04 -0000 1.33
***************
*** 152,176 ****
{
WebsiteData website = mUserMgr.getWebsite(username);
! db.begin();
! OQLQuery oql =
! db.getOQLQuery(
! "CALL SQL SELECT websiteid,SUM(dayhits),SUM(totalhits)"
! +" FROM referer WHERE websiteid='"+ website.getId()
! +"' GROUP BY websiteid AS org.roller.business.HitCountData");
! QueryResults results = oql.execute(Database.ReadOnly);
! while (results.hasMore())
! {
! HitCountData hitCount = (HitCountData) results.next();
! if ( type.equals("dayhits"))
! {
! hits = hitCount.getDayHitCount().intValue();
! }
! else
! {
! hits = hitCount.getTotalHitCount().intValue();
! }
! break;
! }
! db.commit();
}
catch (PersistenceException pe)
--- 152,179 ----
{
WebsiteData website = mUserMgr.getWebsite(username);
! if (website != null)
! {
! db.begin();
! OQLQuery oql =
! db.getOQLQuery(
! "CALL SQL SELECT
websiteid,SUM(dayhits),SUM(totalhits)"
! +" FROM referer WHERE websiteid='"+ website.getId()
! +"' GROUP BY websiteid AS
org.roller.business.HitCountData");
! QueryResults results = oql.execute(Database.ReadOnly);
! while (results.hasMore())
! {
! HitCountData hitCount = (HitCountData) results.next();
! if ( type.equals("dayhits"))
! {
! hits = hitCount.getDayHitCount().intValue();
! }
! else
! {
! hits = hitCount.getTotalHitCount().intValue();
! }
! break;
! }
! db.commit();
! }
}
catch (PersistenceException pe)
***************
*** 201,205 ****
"w.name, u.username, SUM(r.dayhits) AS hits "+
"FROM rolleruser AS u, website AS w, referer AS r "+
! "WHERE r.websiteid=w.id AND w.userid=u.id "+
"GROUP BY w.id ORDER BY hits DESC LIMIT "+max+
" AS org.roller.pojos.WebsiteDisplayData"
--- 204,208 ----
"w.name, u.username, SUM(r.dayhits) AS hits "+
"FROM rolleruser AS u, website AS w, referer AS r "+
! "WHERE r.websiteid=w.id AND w.userid=u.id AND u.userenabled=1
"+
"GROUP BY w.id ORDER BY hits DESC LIMIT "+max+
" AS org.roller.pojos.WebsiteDisplayData"
***************
*** 235,238 ****
--- 238,243 ----
{
WebsiteData website = mUserMgr.getWebsite(username);
+ if (website == null) return new RefererData[0];
+
Object[] args = { website.getId() };
String query =
***************
*** 251,254 ****
--- 256,261 ----
{
WebsiteData website = mUserMgr.getWebsite(username);
+ if (website == null) return new RefererData[0];
+
Object[] args = { website.getId() };
String query =
***************
*** 270,273 ****
--- 277,282 ----
{
WebsiteData website = mUserMgr.getWebsite(username);
+ if (website == null) return new RefererData[0];
+
Object[] args = { website.getId(),date,new Boolean(false) };
String query =
Index: UserManagerImpl.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/business/castor/UserManagerImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** UserManagerImpl.java 6 Jun 2003 19:14:45 -0000 1.24
--- UserManagerImpl.java 26 Jun 2003 17:11:05 -0000 1.25
***************
*** 146,151 ****
{
String query = "select w from org.roller.pojos.WebsiteData w "+
! "where w.user.userName=$1";
! Object[] args = {userName};
ArrayList list = mSupport.query(db,query,args);
return list.size()>0 ? (WebsiteData)list.get(0) : null;
--- 146,151 ----
{
String query = "select w from org.roller.pojos.WebsiteData w "+
! "where w.user.userName=$1 and w.user.userEnabled=$2";
! Object[] args = {userName, Boolean.TRUE};
ArrayList list = mSupport.query(db,query,args);
return list.size()>0 ? (WebsiteData)list.get(0) : null;
***************
*** 302,308 ****
OQLQuery oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.PageData p WHERE "
! + " website.id=$1 AND name=$2");
oql.bind(website.getId());
oql.bind(pageName);
QueryResults results = oql.execute(accessMode);
while (results.hasMore())
--- 302,309 ----
OQLQuery oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.PageData p WHERE "
! + " website.id=$1 AND name=$2 and
p.website.user.userEnabled=$3");
oql.bind(website.getId());
oql.bind(pageName);
+ oql.bind(Boolean.TRUE);
QueryResults results = oql.execute(accessMode);
while (results.hasMore())
***************
*** 379,385 ****
OQLQuery oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.PageData p WHERE "
! + " website.id=$1 AND link=$2");
oql.bind(website.getId());
oql.bind(pageLink);
QueryResults results = oql.execute(accessMode);
while (results.hasMore())
--- 380,387 ----
OQLQuery oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.PageData p WHERE "
! + " website.id=$1 AND link=$2 and
p.website.user.userEnabled=$3");
oql.bind(website.getId());
oql.bind(pageLink);
+ oql.bind(Boolean.TRUE);
QueryResults results = oql.execute(accessMode);
while (results.hasMore())
***************
*** 438,443 ****
WebsiteData website = getWebsite(db, userName);
OQLQuery oql = db.getOQLQuery(
! "SELECT p FROM org.roller.pojos.PageData p WHERE website.id=$1");
oql.bind(website.getId());
QueryResults results = oql.execute();
while (results.hasMore())
--- 440,446 ----
WebsiteData website = getWebsite(db, userName);
OQLQuery oql = db.getOQLQuery(
! "SELECT p FROM org.roller.pojos.PageData p " +
"WHERE website.id=$1 and p.website.user.userEnabled=$2");
oql.bind(website.getId());
+ oql.bind(Boolean.TRUE);
QueryResults results = oql.execute();
while (results.hasMore())
***************
*** 464,468 ****
//-----------------------------------------------------------------------
! public UserData getUser(String userName) throws RollerException
{
if (userName == null)
--- 467,476 ----
//-----------------------------------------------------------------------
! public UserData getUser(String userName) throws RollerException
! {
! return getUser(userName, true);
! }
!
! public UserData getUser(String userName, boolean enabledOnly) throws
RollerException
{
if (userName == null)
***************
*** 475,482 ****
db.begin();
! OQLQuery oql = db.getOQLQuery(
! "SELECT p FROM org.roller.pojos.UserData p WHERE
userName=$1");
oql.bind(userName);
QueryResults results = oql.execute();
Vector v = new Vector();
--- 483,493 ----
db.begin();
+
+ String query = "SELECT p FROM org.roller.pojos.UserData p WHERE
userName=$1";
+ if (enabledOnly) query += " and userEnabled=$2";
! OQLQuery oql = db.getOQLQuery( query );
oql.bind(userName);
+ if (enabledOnly) oql.bind(Boolean.TRUE);
QueryResults results = oql.execute();
Vector v = new Vector();
***************
*** 508,511 ****
--- 519,527 ----
**/
public UserData getUserById(String userId) throws RollerException
+ {
+ return getUserById(userId, true);
+ }
+
+ public UserData getUserById(String userId, boolean enabledOnly) throws
RollerException
{
Database db = mSupport.getDatabase();
***************
*** 513,521 ****
{
UserData user = null;
db.begin();
! OQLQuery oql = db.getOQLQuery(
! "SELECT p FROM org.roller.pojos.UserData p WHERE id=$1");
oql.bind(userId);
QueryResults results = oql.execute();
Vector v = new Vector();
--- 529,540 ----
{
UserData user = null;
+
+ String query = "SELECT p FROM org.roller.pojos.UserData
p WHERE id=$1";
+ if (enabledOnly) query += " and userEnabled=$2";
db.begin();
! OQLQuery oql = db.getOQLQuery( query );
oql.bind(userId);
+ if (enabledOnly) oql.bind(Boolean.TRUE);
QueryResults results = oql.execute();
Vector v = new Vector();
***************
*** 544,547 ****
--- 563,571 ----
public UserData[] getUsers() throws RollerException
+ {
+ return getUsers(true);
+ }
+
+ public UserData[] getUsers(boolean enabledOnly) throws RollerException
{
Database db = mSupport.getDatabase();
***************
*** 549,557 ****
{
UserData[] users = null;
db.begin();
OQLQuery oql =
! db.getOQLQuery("SELECT p FROM org.roller.pojos.UserData p ");
QueryResults results = oql.execute();
--- 573,585 ----
{
UserData[] users = null;
+
+ String query = "SELECT p FROM org.roller.pojos.UserData
p ";
+ if (enabledOnly) query += " where userEnabled=$1";
db.begin();
OQLQuery oql =
! db.getOQLQuery( query );
! if (enabledOnly) oql.bind(Boolean.TRUE);
QueryResults results = oql.execute();
Index: WeblogManagerImpl.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/business/castor/WeblogManagerImpl.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** WeblogManagerImpl.java 25 May 2003 20:44:33 -0000 1.42
--- WeblogManagerImpl.java 26 Jun 2003 17:11:05 -0000 1.43
***************
*** 210,217 ****
oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogEntryData p "
! + "WHERE website.id=$1 AND anchor=$2 "
+ "ORDER BY pubTime DESC");
oql.bind(website.getId());
oql.bind(anchor);
QueryResults results = oql.execute(Database.ReadOnly);
while (results.hasMore())
--- 210,218 ----
oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogEntryData p "
! + "WHERE website.id=$1 AND anchor=$2 and
website.user.userEnabled=$3 "
+ "ORDER BY pubTime DESC");
oql.bind(website.getId());
oql.bind(anchor);
+ oql.bind(Boolean.TRUE);
QueryResults results = oql.execute(Database.ReadOnly);
while (results.hasMore())
***************
*** 258,264 ****
oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogEntryData p "
! + "WHERE pubTime<=$1 "
! + "ORDER BY pubTime DESC LIMIT $2");
oql.bind(endDate);
oql.bind(new Integer(max));
--- 259,266 ----
oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogEntryData p "
! + "WHERE pubTime<=$1 and website.user.userEnabled=$2 "
! + "ORDER BY pubTime DESC LIMIT $3");
oql.bind(endDate);
+ oql.bind(Boolean.TRUE);
oql.bind(new Integer(max));
***************
*** 317,321 ****
"SELECT p FROM org.roller.pojos.WeblogEntryData p "
+ "WHERE website.id=$1 and p.category.id=$2 "
! + "AND pubTime>=$3 AND pubTime<=$4 "
+ "ORDER BY pubTime DESC");
oql1.bind(website.getId());
--- 319,323 ----
"SELECT p FROM org.roller.pojos.WeblogEntryData p "
+ "WHERE website.id=$1 and p.category.id=$2 "
! + "AND pubTime>=$3 AND pubTime<=$4 and
website.user.userEnabled=$5 "
+ "ORDER BY pubTime DESC");
oql1.bind(website.getId());
***************
*** 323,326 ****
--- 325,329 ----
oql1.bind(startDate);
oql1.bind(endDate);
+ oql1.bind(Boolean.TRUE);
}
else
***************
*** 328,336 ****
oql1 = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogEntryData p "
! + "WHERE website.id=$1 AND pubTime>=$2 AND pubTime<=$3 "
+ "ORDER BY pubTime DESC");
oql1.bind(website.getId());
oql1.bind(startDate);
oql1.bind(endDate);
}
QueryResults results1 = oql1.execute(Database.ReadOnly);
--- 331,340 ----
oql1 = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogEntryData p "
! + "WHERE website.id=$1 AND pubTime>=$2 AND pubTime<=$3 "
+ "and website.user.userEnabled=$4 "
+ "ORDER BY pubTime DESC");
oql1.bind(website.getId());
oql1.bind(startDate);
oql1.bind(endDate);
+ oql1.bind(Boolean.TRUE);
}
QueryResults results1 = oql1.execute(Database.ReadOnly);
***************
*** 464,471 ****
ArrayList args = new ArrayList();
! query += " WHERE p.pubTime <= $1";
args.add( day );
! int argCount = 2;
if ( publishedOnly )
{
--- 468,476 ----
ArrayList args = new ArrayList();
! query += " WHERE p.pubTime <= $1 and website.user.userEnabled =
$2";
args.add( day );
+ args.add( Boolean.TRUE );
! int argCount = 3;
if ( publishedOnly )
{
***************
*** 644,653 ****
throws RollerException
{
try
{
OQLQuery oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogCategoryData p " +
! "WHERE website.id=$1");
oql.bind(website.getId());
QueryResults results = oql.execute();
ArrayList cats = new ArrayList();
--- 649,660 ----
throws RollerException
{
+ if (website == null) return new WeblogCategoryData[0];
try
{
OQLQuery oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogCategoryData p " +
! "WHERE website.id=$1 and website.user.userEnabled=$2");
oql.bind(website.getId());
+ oql.bind(Boolean.TRUE);
QueryResults results = oql.execute();
ArrayList cats = new ArrayList();
***************
*** 742,748 ****
oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogCategoryData p "
! + "WHERE website.id=$1 AND name=$2");
oql.bind(website.getId());
oql.bind(catName);
QueryResults results = oql.execute();
while (results.hasMore())
--- 749,756 ----
oql = db.getOQLQuery(
"SELECT p FROM org.roller.pojos.WeblogCategoryData p "
! + "WHERE website.id=$1 AND name=$2 and
website.user.userEnabled=$3");
oql.bind(website.getId());
oql.bind(catName);
+ oql.bind(Boolean.TRUE);
QueryResults results = oql.execute();
while (results.hasMore())
***************
*** 791,796 ****
WeblogEntryData entry = (WeblogEntryData) results.next();
entry.setCategory(destCd);
- //entry.setAttribute( CATEGORY_ATT, destCd );
- //storePersistentObject( db, entry, WEBLOGENTRY_CLASS );
}
--- 799,802 ----
***************
*** 817,837 ****
db.begin();
- /*
- data.getEntry().getWebsite().setUser( (UserData)
- mSupport.storePersistentObject(
- db,data.getEntry().getWebsite().getUser()));
-
- data.getEntry().setWebsite( (WebsiteData)
-
mSupport.storePersistentObject(db,data.getEntry().getWebsite()) );
-
- data.getEntry().setCategory( (WeblogCategoryData)
-
mSupport.storePersistentObject(db,data.getEntry().getCategory()) );
-
- data.getEntry().getCategory().setWebsite(
- data.getEntry().getWebsite());
-
- data.setEntry( (WeblogEntryData)
- mSupport.storePersistentObject(db,data.getEntry()) );
- */
data.setEntry( (WeblogEntryData)
mSupport.retrievePersistentObject(db,
--- 823,826 ----
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
|
