diff --git a/client/Application.cfc b/client/Application.cfc new file mode 100644 index 0000000..525cd2d --- /dev/null +++ b/client/Application.cfc @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Something bad happened. The error Was Logged. We apologize for the inconvenience. + + + Exception: + + + EventName: + + + CGI: + + + Form: + + + URL: + + + Session: + + + + + Request + + + + + + + + Exception: + + + EventName: + + + CGI: + + + Form: + + + URL: + + + Session: + + + + + Request + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/Application.cfm b/client/Application.cfm deleted file mode 100644 index 1e1b76c..0000000 --- a/client/Application.cfm +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/addcomment.cfm b/client/addcomment.cfm index c25abfa..15eaaf9 100644 --- a/client/addcomment.cfm +++ b/client/addcomment.cfm @@ -83,21 +83,21 @@ - + - - + + - - + + - + - + @@ -105,7 +105,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -147,7 +147,7 @@ -#paragraphformat2(htmlEditFormat(form.comments))# +#application.utils.ParagraphFormat2(htmlEditFormat(form.comments))#
@@ -229,7 +229,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - #application.blog.getProperty("blogTitle")# : #rb("addcomments")# + #application.blog.getProperty("blogTitle")# : #request.rb("addcomments")# @@ -237,7 +237,7 @@ -
#rb("comments")#: #entry.title#
+
#request.rb("comments")#: #entry.title#
@@ -247,7 +247,7 @@
- #rb("correctissues")#: + #request.rb("correctissues")#:
  • #arrayToList(aErrors, "
  • ")#
@@ -258,43 +258,43 @@
- #rb("postyourcomments")# + #request.rb("postyourcomments")#
- +
- +
- +
- +
- +
- +
Captcha
- + checked="checked" />
- + checked="checked" />
-

#rb("subscribetext")#

+

#request.rb("subscribetext")#

- +
@@ -303,7 +303,7 @@ -

#rb("commentsnotallowed")#

+

#request.rb("commentsnotallowed")#

diff --git a/client/addsub.cfm b/client/addsub.cfm index 895f79c..26db285 100644 --- a/client/addsub.cfm +++ b/client/addsub.cfm @@ -45,8 +45,8 @@ - - "> + + "> @@ -86,7 +86,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - #application.blog.getProperty("blogTitle")# : #rb("addsub")# + #application.blog.getProperty("blogTitle")# : #request.rb("addsub")# @@ -94,39 +94,39 @@ -
#rb("comments")#: #entry.title#
+
#request.rb("comments")#: #entry.title#
- #rb("correctissues")#:
#errorStr#
+ #request.rb("correctissues")#:
#errorStr#
- #rb("addsub")# + #request.rb("addsub")#
- +
- +
Captcha
- + checked="checked" />
- +
@@ -135,7 +135,7 @@ -

#rb("subnotallowed")#

+

#request.rb("subnotallowed")#

diff --git a/client/admin/Application.cfc b/client/admin/Application.cfc new file mode 100644 index 0000000..6e55337 --- /dev/null +++ b/client/admin/Application.cfc @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/admin/Application.cfm b/client/admin/Application.cfm deleted file mode 100644 index cf42d7b..0000000 --- a/client/admin/Application.cfm +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/admin/RootApplication.cfc b/client/admin/RootApplication.cfc new file mode 100644 index 0000000..b5a6fc5 --- /dev/null +++ b/client/admin/RootApplication.cfc @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/client/admin/comment.cfm b/client/admin/comment.cfm index f234e0f..7857c6b 100644 --- a/client/admin/comment.cfm +++ b/client/admin/comment.cfm @@ -28,10 +28,10 @@ - + - + diff --git a/client/admin/downloads.cfm b/client/admin/downloads.cfm new file mode 100644 index 0000000..5668acb --- /dev/null +++ b/client/admin/downloads.cfm @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Warning: Doesn't differentiate between listened to on-line and downloaded [yet] we did start collecting the data.
+ Warning 2: This stuff was lots more performant when I Created specific indexes, but the specifics are lost in time. +
+ +
+ + +
+ + + + + + + + + + +
Start DateEnd Date
+ + + + + + + + + +
+
+ + +

Download Report

+ + + + + + + + + + + + + +
Release DateTitleTotal Downloads
#DateFormat(DownloadReport.posted,"mm/dd/yyyy")##DownloadReport.Title##DownloadReport.TotalDownloads#
+ +
+ +

Impression Report

+ + + + + + + + + + + + +
MediaTotal Impressions
#ImpressionReport.MediaText##ImpressionReport.Description##ImpressionReport.totalViews#
+ +
+ + + +
+ + +
\ No newline at end of file diff --git a/client/admin/entry.cfm b/client/admin/entry.cfm index 15efc00..fa4e4ca 100644 --- a/client/admin/entry.cfm +++ b/client/admin/entry.cfm @@ -479,6 +479,12 @@ Enclosure logic move out to always run. Thinking is that it needs to run on prev + #listLast(form.oldenclosure,"/\")#
+ + Download Link: #application.rooturl#/download.cfm/id/#id#/online/1/#urlEncodedFormat(getFileFromPath(oldenclosure))# + + Download Link: Won't show up until you save the entry and the UniqueID is generated +
diff --git a/client/admin/filemanager.cfm b/client/admin/filemanager.cfm index 5489330..853eb2b 100644 --- a/client/admin/filemanager.cfm +++ b/client/admin/filemanager.cfm @@ -120,7 +120,7 @@
- #kbytes(size)#  + #application.utils.KBytes(size)#  #dateFormat(datelastmodified)# #timeFormat(datelastmodified)# diff --git a/client/admin/imgbrowse.cfm b/client/admin/imgbrowse.cfm index d3f7f02..f7dfc14 100644 --- a/client/admin/imgbrowse.cfm +++ b/client/admin/imgbrowse.cfm @@ -78,7 +78,7 @@ function insertIt(url) { #name# - #kbytes(size)#  + #application.utils.KBytes(size)#    diff --git a/client/admin/index.cfm b/client/admin/index.cfm index e80c72e..56c7cfb 100644 --- a/client/admin/index.cfm +++ b/client/admin/index.cfm @@ -22,8 +22,8 @@ select id, title, views, posted -from tblblogentries -where tblblogentries.blog = +from #application.tableprefix#tblBlogEntries +where #application.tableprefix#tblBlogEntries.blog = and posted > order by views desc diff --git a/client/admin/moderate.cfm b/client/admin/moderate.cfm index 08aa88c..8bdbbbb 100644 --- a/client/admin/moderate.cfm +++ b/client/admin/moderate.cfm @@ -22,7 +22,7 @@ - + @@ -38,7 +38,7 @@ -#paragraphformat2(htmlEditFormat(c.comment))# +#application.utils.ParagraphFormat2(htmlEditFormat(c.comment))#
diff --git a/client/admin/settings.cfm b/client/admin/settings.cfm index 102a547..3ab2e5f 100644 --- a/client/admin/settings.cfm +++ b/client/admin/settings.cfm @@ -57,11 +57,11 @@ http://blogcfc.riaforge.org/index.cfm?event=page.issue&issueid=4CEC3A8A-C919-ED1 - + - + diff --git a/client/admin/stats.cfm b/client/admin/stats.cfm index ece9430..c096246 100644 --- a/client/admin/stats.cfm +++ b/client/admin/stats.cfm @@ -16,7 +16,7 @@ ---> - + @@ -28,8 +28,8 @@ select count(id) as totalentries, min(posted) as firstentry, max(posted) as lastentry - from tblblogentries - where tblblogentries.blog = + from #application.tableprefix#tblblogentries + where #application.tableprefix#tblblogentries.blog = @@ -41,14 +41,14 @@ select sum(views) as total - from tblblogentries - where tblblogentries.blog = + from #application.tableprefix#tblblogentries + where #application.tableprefix#tblblogentries.blog = select top 10 id, title, views - from tblblogentries - where tblblogentries.blog = + from #application.tableprefix#tblblogentries + where #application.tableprefix#tblblogentries.blog = and rownum <= 10 @@ -60,16 +60,16 @@ select count(id) as totalentries - from tblblogentries - where tblblogentries.blog = + from #application.tableprefix#tblblogentries + where #application.tableprefix#tblblogentries.blog = and posted >= select count(#application.tableprefix#tblBlogComments.id) as totalcomments - from #application.tableprefix#tblBlogComments, tblblogentries - where #application.tableprefix#tblBlogComments.entryidfk = tblblogentries.id - and tblblogentries.blog = + from #application.tableprefix#tblBlogComments, #application.tableprefix#tblblogentries + where #application.tableprefix#tblBlogComments.entryidfk = #application.tableprefix#tblblogentries.id + and #application.tableprefix#tblblogentries.blog = and #application.tableprefix#tblBlogComments.moderated = 1 @@ -93,22 +93,22 @@ select top 10 - tblblogentries.id, tblblogentries.title, count(#application.tableprefix#tblBlogComments.id) as commentcount - from tblblogentries, tblblogcomments - where tblblogcomments.entryidfk = tblblogentries.id + #application.tableprefix#tblblogentries.id, #application.tableprefix#tblblogentries.title, count(#application.tableprefix#tblBlogComments.id) as commentcount + from #application.tableprefix#tblblogentries, #application.tableprefix#tblBlogComments + where #application.tableprefix#tblBlogComments.entryidfk = #application.tableprefix#tblblogentries.id and rownum <= 10 - and tblblogentries.blog = + and #application.tableprefix#tblblogentries.blog = - and tblblogcomments.moderated = 1 + and #application.tableprefix#tblBlogComments.moderated = 1 - group by tblblogentries.id, tblblogentries.title + group by #application.tableprefix#tblblogentries.id, #application.tableprefix#tblblogentries.title order by commentcount desc - order by count(tblblogcomments.id) desc + order by count(#application.tableprefix#tblBlogComments.id) desc limit 10 @@ -119,22 +119,22 @@ top 10 #application.tableprefix#tblBlogCategories.categoryid, #application.tableprefix#tblBlogCategories.categoryname, - count(tblblogcomments.id) as commentcount - from #application.tableprefix#tblBlogCategories, tblblogcomments, #application.tableprefix#tblBlogEntriesCategories - where tblblogcomments.entryidfk = #application.tableprefix#tblBlogEntriesCategories.entryidfk + count(#application.tableprefix#tblBlogComments.id) as commentcount + from #application.tableprefix#tblBlogCategories, #application.tableprefix#tblBlogComments, #application.tableprefix#tblBlogEntriesCategories + where #application.tableprefix#tblBlogComments.entryidfk = #application.tableprefix#tblBlogEntriesCategories.entryidfk and rownum <= 10 and #application.tableprefix#tblBlogEntriesCategories.categoryidfk = #application.tableprefix#tblBlogCategories.categoryid and #application.tableprefix#tblBlogCategories.blog = - and tblblogcomments.moderated = 1 + and #application.tableprefix#tblBlogComments.moderated = 1 group by #application.tableprefix#tblBlogCategories.categoryid, #application.tableprefix#tblBlogCategories.categoryname order by commentcount desc - order by count(tblblogcomments.id) desc + order by count(#application.tableprefix#tblBlogComments.id) desc limit 10 @@ -158,15 +158,15 @@ - select count(tblblogcomments.email) as emailCount, email, tblblogcomments.name - from tblblogcomments, tblblogentries - where tblblogcomments.entryidfk = tblblogentries.id - and tblblogentries.blog = - group by tblblogcomments.email, tblblogcomments.name + select count(#application.tableprefix#tblBlogComments.email) as emailCount, email, #application.tableprefix#tblBlogComments.name + from #application.tableprefix#tblBlogComments, #application.tableprefix#tblblogentries + where #application.tableprefix#tblBlogComments.entryidfk = #application.tableprefix#tblblogentries.id + and #application.tableprefix#tblblogentries.blog = + group by #application.tableprefix#tblBlogComments.email, #application.tableprefix#tblBlogComments.name order by emailCount desc - order by count(tblblogcomments.email) desc + order by count(#application.tableprefix#tblBlogComments.email) desc @@ -189,56 +189,56 @@
- + - + - + - + - + - - + + - + - + - + - + - + @@ -311,7 +311,7 @@ - +
#rb("totalnumentries")#:#request.rb("totalnumentries")#: #numberFormat(getTotalEntries.totalEntries)#
#rb("last30")#:#request.rb("last30")#: #numberFormat(last30.totalEntries)#
#rb("last30avg")#:#request.rb("last30avg")#: #numberFormat(last30.totalEntries/30,"999.99")# 
#rb("firstentry")#:#request.rb("firstentry")#: #dateFormat(getTotalEntries.firstEntry,"mm/dd/yy")# 
#rb("lastentry")#:#request.rb("lastentry")#: #dateFormat(getTotalEntries.lastEntry,"mm/dd/yy")# 
#rb("bloggingfor")#:#numberFormat(variables.dur)# #rb("days")# #request.rb("bloggingfor")#:#numberFormat(variables.dur)# #request.rb("days")# 
#rb("totalcomments")#:#request.rb("totalcomments")#: #numberFormat(getTotalComments.totalComments)#
#rb("avgcommentsperentry")#:#request.rb("avgcommentsperentry")#: #numberFormat(averageCommentsPerEntry,"999.99")#
#rb("totalviews")#:#request.rb("totalviews")#: #numberFormat(getTotalViews.total)#
#rb("avgviews")#:#request.rb("avgviews")#: #numberFormat(gettotalviews.total/gettotalentries.totalentries,"999.99")# @@ -248,7 +248,7 @@
#rb("totalsubscribers")#:#request.rb("totalsubscribers")#: #getTotalSubscribers.totalsubscribers#
#categoryname##commentCount# (#rb("avgcommentperentry")#: #avg#)#commentCount# (#request.rb("avgcommentperentry")#: #avg#)
diff --git a/client/admin/stats2.cfm b/client/admin/stats2.cfm new file mode 100644 index 0000000..c8d6f76 --- /dev/null +++ b/client/admin/stats2.cfm @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + SELECT yearPosted,numberOfEntries + FROM NumberOfBlogEntriesByYear + + + + + + SELECT yearPosted, categoryname,numberofEntries + FROM NumberOfBlogEntriesByYearThenCategory + where categoryname = 'Personal' + + + SELECT yearPosted, categoryname,numberofEntries + FROM NumberOfBlogEntriesByYearThenCategory + where categoryname = 'Professional' + + + + + + + SELECT yearPosted, categoryname,numberofEntries + FROM NumberOfBlogEntriesByYearThenCategory + where categoryName not in ('Personal','Professional') + order by yearPosted , categoryname + + + + + + + SELECT yearPosted, categoryname,numberofEntries + FROM NumberOfBlogEntriesByYearThenCategory + where categoryname = 'Flex' + + + SELECT yearPosted, categoryname,numberofEntries + FROM NumberOfBlogEntriesByYearThenCategory + where categoryname = 'ColdFusion' + + + SELECT yearPosted, categoryname,numberofEntries + FROM NumberOfBlogEntriesByYearThenCategory + where categoryname = 'AngularJS' + + + +

Number of Entries Per Year

+
+ + + + + + + +

Personal vs Professional Posts

+ +
+ + + + + + + + + + + + #variables.previousYear#"

+ + + + + + +
+ + +
+
+ + + + + + #variables.previousYear#"

+ + + + + + +
+ + +
+
+
+ + + +

Number of Posts by Year by Category

+
+ + + + + + + + + + + + + +

+
+ + + +

ColdFusion vs Flex vs AngularJS c

+
+ + + + + + #variables.previousYear#"

+ + + + + +
+ + +
+
+ + + + + + #variables.previousYear#"

+ + + + + +
+ + +
+
+ + + + + + #variables.previousYear#"

+ + + + + +
+ + +
+
+
+ + + + + + + + #variables.previousYear#"

+ + + + + +
+ + +
+
+ + + + + + #variables.previousYear#"

+ + + + + +
+ + +
+
+ + + + + + #variables.previousYear#"

+ + + + + +
+ + +
+
+
+ + +
+ + \ No newline at end of file diff --git a/client/admin/statsbyyear.cfm b/client/admin/statsbyyear.cfm new file mode 100644 index 0000000..002807f --- /dev/null +++ b/client/admin/statsbyyear.cfm @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + select count(id) as totalentries, + min(posted) as firstentry, + max(posted) as lastentry + from tblblogentries + where tblblogentries.blog = + and year(posted) = + + + + select count(email) as totalsubscribers + from tblblogsubscribers + where tblblogsubscribers.blog = + and verified = 1 + + + + select sum(views) as total + from tblblogentries + where tblblogentries.blog = + and year(posted) = + + + + select top 10 id, title, views + from tblblogentries + where tblblogentries.blog = + and year(posted) = + order by views desc + limit 10 + + + + select count(tblblogcomments.id) as totalcomments + from tblblogcomments, tblblogentries + where tblblogcomments.entryidfk = tblblogentries.id + and tblblogentries.blog = + + and tblblogcomments.moderated = 1 + + and year(tblblogcomments.posted) = + + + + + select categoryid, categoryname, count(categoryidfk) as total + from tblblogcategories, tblblogentriescategories, tblblogentries + where tblblogentriescategories.categoryidfk = tblblogcategories.categoryid + and tblblogcategories.blog = + and tblblogentriescategories.entryidfk = tblblogentries.id + and year(tblblogentries.posted) = + group by tblblogcategories.categoryid, tblblogcategories.categoryname + + order by total desc + + order by count(categoryidfk) desc + + + + + + select + top 10 + tblblogentries.id, tblblogentries.title, count(tblblogcomments.id) as commentcount + from tblblogentries, tblblogcomments + where tblblogcomments.entryidfk = tblblogentries.id + and tblblogentries.blog = + + and tblblogcomments.moderated = 1 + + and year(tblblogcomments.posted) = + + group by tblblogentries.id, tblblogentries.title + + order by commentcount desc + + order by count(tblblogcomments.id) desc + + limit 10 + + + + + select + top 10 + tblblogcategories.categoryid, + tblblogcategories.categoryname, + count(tblblogcomments.id) as commentcount + from tblblogcategories, tblblogcomments, tblblogentriescategories + where tblblogcomments.entryidfk = tblblogentriescategories.entryidfk + and tblblogentriescategories.categoryidfk = tblblogcategories.categoryid + and tblblogcategories.blog = + and year(tblblogcomments.posted) = + + and tblblogcomments.moderated = 1 + + group by tblblogcategories.categoryid, tblblogcategories.categoryname + + order by commentcount desc + + order by count(tblblogcomments.id) desc + + limit 10 + + + + select + top 10 + searchterm, count(searchterm) as total + from tblblogsearchstats + where blog = + and year(searched) = + + group by searchterm + + order by total desc + + order by count(searchterm) desc + + limit 10 + + + + + + + + + +
Stats for #statsYear#
+ + +

+ +

#request.rb("generalstats")#
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#request.rb("totalnumentries")#:#getTotalEntries.totalEntries#
#request.rb("firstentry")#:#dateFormat(getTotalEntries.firstEntry,"mm/dd/yy")# 
#request.rb("lastentry")#:#dateFormat(getTotalEntries.lastEntry,"mm/dd/yy")# 
#request.rb("totalcomments")#:#getTotalComments.totalComments#
#request.rb("avgcommentsperentry")#:#numberFormat(averageCommentsPerEntry,"999.99")#
#request.rb("totalviews")#:#getTotalViews.total#
Average Views: + + #numberFormat(gettotalviews.total/gettotalentries.totalentries,"999.99")# + + 0 + +
#request.rb("totalsubscribers")#:#getTotalSubscribers.totalsubscribers#
+
+ +

+ +

#request.rb("topviews")#
+
+ + + + + + + +
#title##views#
+
+ +

+ +

#request.rb("categorystats")#
+
+ + + + + + + +
#categoryname##total#
+
+ +

+ +

#request.rb("topentriesbycomments")#
+
+ + + + + + + +
#title##commentCount#
+
+ +

+ +

#request.rb("topcategoriesbycomments")#
+
+ + + + + select total + from getCategoryCount + where categoryid = '#categoryid#' + + + + + + + + + + + + + + + +
#categoryname##commentCount# (#rb("avgcommentperentry")#: #avg#)
+
+ +

+ +

#request.rb("topsearchterms")#
+
+ + + + + + + +
#searchterm##total#
+
+ +
+ +
+ + \ No newline at end of file diff --git a/client/confirmsubscription.cfm b/client/confirmsubscription.cfm index e2a789b..25842ab 100644 --- a/client/confirmsubscription.cfm +++ b/client/confirmsubscription.cfm @@ -22,13 +22,13 @@ - + -
#rb("subscribeconfirm")#
+
#request.rb("subscribeconfirm")#
- #rb("subscribeconfirmbody")# + #request.rb("subscribeconfirmbody")#
diff --git a/client/contact.cfm b/client/contact.cfm index 88ea6e0..e830548 100644 --- a/client/contact.cfm +++ b/client/contact.cfm @@ -18,13 +18,13 @@ - + - - + + - + @@ -40,9 +40,9 @@ -#rb("commentadded")#: #application.localeUtils.dateLocaleFormat(commentTime)# / #application.localeUtils.timeLocaleFormat(commentTime)# -#rb("commentmadeby")#: #form.name# (#form.email#) -#rb("ipofposter")#: #cgi.REMOTE_ADDR# +#request.rb("commentadded")#: #application.localeUtils.dateLocaleFormat(commentTime)# / #application.localeUtils.timeLocaleFormat(commentTime)# +#request.rb("commentmadeby")#: #form.name# (#form.email#) +#request.rb("ipofposter")#: #cgi.REMOTE_ADDR# #form.comments# @@ -55,7 +55,7 @@ Created by Raymond Camden (ray@camdenfamily.com) - + -
#rb("contactowner")#
+
#request.rb("contactowner")#

- #rb("contactownerform")# + #request.rb("contactownerform")#

- #rb("correctissues")#:
  • #arrayToList(aErrors, "
  • ")#
+ #request.rb("correctissues")#:
  • #arrayToList(aErrors, "
  • ")#
-
+
-
+
-
+
- +
Captcha
- +
@@ -119,7 +119,7 @@ Created by Raymond Camden (ray@camdenfamily.com)

- #rb("contactsent")# + #request.rb("contactsent")#

diff --git a/client/download.cfm b/client/download.cfm new file mode 100644 index 0000000..63b63c3 --- /dev/null +++ b/client/download.cfm @@ -0,0 +1,63 @@ + + + + url = application.utils.parseSES(); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #application.rooturl#/#url.dir#/#urlEncodedFormat(getFileFromPath(entry.enclosure))# + + + + + + + diff --git a/client/download2.cfm b/client/download2.cfm new file mode 100644 index 0000000..c6f2c43 --- /dev/null +++ b/client/download2.cfm @@ -0,0 +1,129 @@ + + + + url = application.utils.parseSES(); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + function f_Stream(s_file,i_seek,MIME_TYPE,fileName) { + var i_position = i_seek; + var i_buffer = 10000; + var byteClass = createObject("java", "java.lang.Byte"); // + var byteArray = createObject("java","java.lang.reflect.Array").newInstance(byteClass.TYPE, i_buffer); + var context = getPageContext(); + var response = context.getResponse().getResponse(); + + var instream = createObject("java", "java.io.FileInputStream"); + var outstream = response.getOutputStream(); // take over control of the feed to the browser + + if(structKeyexists(arguments,"MIME_TYPE")) + response.setContentType(MIME_TYPE); + if(structKeyExists(arguments,"fileName")) + response.setHeader("content-disposition","inline; filename=#fileName#"); + byteClass.Init(1); + instream.init(s_file); + context.setFlushOutput(false); + try { + if(i_seek GT 0) { + //instream.skip(i_seek); + //outstream.write(toBinary('RkxWAQEAAAAJAAAACQ==')); // output the header bytes + } + do { + i_length = instream.read(byteArray,0,i_buffer); + if (i_length neq -1) { + outstream.write(byteArray); + outstream.flush(); + } + } while (i_length neq -1); // keep going until there's nothing left to read. + } + catch(any excpt) {} + outstream.flush(); // send any remaining bytes + response.reset(); // reset the feed to the browser + outstream.close(); // close the stream to flash + instream.close(); // close the file stream + } + + + + + + + diff --git a/client/dump.cfm b/client/dump.cfm index 53f3417..d6d3885 100644 --- a/client/dump.cfm +++ b/client/dump.cfm @@ -1 +1,3 @@ - + + + \ No newline at end of file diff --git a/client/error.cfm b/client/error.cfm index 7aa76ba..f194c0e 100644 --- a/client/error.cfm +++ b/client/error.cfm @@ -18,7 +18,9 @@

A critical error has been thrown. Please visit BlogCFC support.

- + + + @@ -27,40 +29,40 @@ -#rb("errorOccured")#:
+#request.rb("errorOccured")#:
- + - + - + - + - + - + - + - +
#rb("date")#:#request.rb("date")#: #dateFormat(now(),"m/d/yy")# #timeFormat(now(),"h:mm tt")#
#rb("scriptName")#:#request.rb("scriptName")#: #cgi.script_name#?#cgi.query_string#
#rb("browser")#:#request.rb("browser")#: #error.browser#
#rb("referer")#:#request.rb("referer")#: #error.httpreferer#
#rb("message")#:#request.rb("message")#: #error.message#
#rb("type")#:#request.rb("type")#: #error.type#
#rb("rootCause")#:#request.rb("rootCause")#:
#rb("tagContext")#:#request.rb("tagContext")#:
@@ -77,15 +79,43 @@ -
#rb("errorpageheader")#
+
#request.rb("errorpageheader")#

- #rb("errorpagebody")# + #request.rb("errorpagebody")#

#mail#
+ + + +Error: + + +CGI: + + +Form: + + +URL: + + +Session: + + + + +Application: + + + + +Request + +
\ No newline at end of file diff --git a/client/includes/pods/recentcomments.cfm b/client/includes/pods/recentcomments.cfm index 6735c01..e72283e 100644 --- a/client/includes/pods/recentcomments.cfm +++ b/client/includes/pods/recentcomments.cfm @@ -24,7 +24,7 @@ - +

#getComments.title#
#getComments.name# #application.resourceBundle.getResource("said")#: #formattedComment#... [#application.resourceBundle.getResource("more")#]

diff --git a/client/includes/pods/subscribe.cfm b/client/includes/pods/subscribe.cfm index 90e897c..d1c2444 100644 --- a/client/includes/pods/subscribe.cfm +++ b/client/includes/pods/subscribe.cfm @@ -29,9 +29,11 @@ I'm making it dynamic in case folks to want to change it quickly on their own bl a deal. In fact, I bet no one is even going to read this. If you do, hi, how are you. Send me an email and we can talk about how sometimes it is necessary to break the rules a bit. Then maybe we can have a beer and talk about good sci-fi movies. + + JH 12/30/2018 Moved isEmail into application.utils class so no more caller syntax but I'm still up for that beer ---> - + diff --git a/client/includes/udf.cfm b/client/includes/udf.cfm deleted file mode 100644 index 8e2c067..0000000 --- a/client/includes/udf.cfm +++ /dev/null @@ -1,166 +0,0 @@ - -function titleCase(str) { - return uCase(left(str,1)) & right(str,len(str)-1); -} - -/** -* Tests passed value to see if it is a valid e-mail address (supports subdomain nesting and new top-level domains). -* Update by David Kearns to support ' -* SBrown@xacting.com pointing out regex still wasn't accepting ' correctly. -* More TLDs -* Version 4 by P Farrel, supports limits on u/h -* Added mobi -* v6 more tlds -* -* @param str The string to check. (Required) -* @return Returns a boolean. -* @author Jeff Guillaume (SBrown@xacting.comjeff@kazoomis.com) -* @version 6, July 29, 2008 -* Note this is different from CFLib as it has the "allow +" support -*/ -function isEmail(str) { -return (REFindNoCase("^['_a-z0-9-]+(\.['_a-z0-9-]+)*(\+['_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*\.(([a-z]{2,3})|(aero|asia|biz|cat|coop|info|museum|name|jobs|post|pro|tel|travel|mobi))$",arguments.str) AND len(listGetAt(arguments.str, 1, "@")) LTE 64 AND -len(listGetAt(arguments.str, 2, "@")) LTE 255) IS 1; -} - -function isLoggedIn() { - return structKeyExists(session,"loggedin"); -} - -/** - * An "enhanced" version of ParagraphFormat. - * Added replacement of tab with nonbreaking space char, idea by Mark R Andrachek. - * Rewrite and multiOS support by Nathan Dintenfas. - * - * @param string The string to format. (Required) - * @return Returns a string. - * @author Ben Forta (ben@forta.com) - * @version 3, June 26, 2002 - */ -function ParagraphFormat2(str) { - //first make Windows style into Unix style - str = replace(str,chr(13)&chr(10),chr(10),"ALL"); - //now make Macintosh style into Unix style - str = replace(str,chr(13),chr(10),"ALL"); - //now fix tabs - str = replace(str,chr(9),"   ","ALL"); - //now return the text formatted in HTML - return replace(str,chr(10),"
","ALL"); -} - -/** - * A quick way to test if a string is a URL - * - * @param stringToCheck The string to check. - * @return Returns a boolean. - * @author Nathan Dintenfass (nathan@changemedia.com) - * @version 1, November 22, 2001 - */ -function isURL(stringToCheck){ - return REFindNoCase("^(((https?:|ftp:|gopher:)\/\/))[-[:alnum:]\?%,\.\/&##!@:=\+~_]+[A-Za-z0-9\/]$",stringToCheck) NEQ 0; -} - -/** - * Converts a byte value into kb or mb if over 1,204 bytes. - * - * @param bytes The number of bytes. (Required) - * @return Returns a string. - * @author John Bartlett (jbartlett@strangejourney.net) - * @version 1, July 31, 2005 - */ -function KBytes(bytes) { - var b=0; - - if(arguments.bytes lt 1024) return trim(numberFormat(arguments.bytes,"9,999")) & " bytes"; - - b=arguments.bytes / 1024; - - if (b lt 1024) { - if(b eq int(b)) return trim(numberFormat(b,"9,999")) & " KB"; - return trim(numberFormat(b,"9,999.9")) & " KB"; - } - b= b / 1024; - if (b eq int(b)) return trim(numberFormat(b,"999,999,999")) & " MB"; - return trim(numberFormat(b,"999,999,999.9")) & " MB"; -} - -/** - * Returns a relative path from the current template to an absolute file path. - * - * @param abspath Absolute path. (Required) - * @return Returns a string. - * @author Isaac Dealey (info@turnkey.to) - * @version 1, May 2, 2003 - */ -function getRelativePath(abspath){ - var aHere = listtoarray(expandPath("/"),"\/"); - var aThere = ""; var lenThere = 0; - var aRel = ArrayNew(1); var x = 0; - var newpath = ""; - - aThere = ListToArray(abspath,"\/"); lenThere = arraylen(aThere); - - for (x = 1; x lte arraylen(aHere); x = x + 1) { - if (x GT lenThere OR comparenocase(aHere[x],aThere[x])) { - ArrayPrepend(aRel,".."); if (x lte lenThere) { ArrayAppend(aRel,aThere[x]); } - } - } - - for (; x lte arraylen(aThere); x = x + 1) { ArrayAppend(aRel,aThere[x]); } - - newpath = "/" & ArrayToList(aRel,"/"); - - return newpath; -} -Request.getRelativePath = getRelativePath; - -
- - - - - - - var inputReturn = arguments.input; - var pattern = ""; - var urlMatches = structNew(); - var inputCopy = arguments.input; - var result = ""; - var rightStart = ""; - var rightInputCopyLen = ""; - var targetNameMax = ""; - var targetLinkName = ""; - var i = ""; - var match = ""; - - pattern = "(((https?:|ftp:|gopher:)\/\/)|(www\.|ftp\.))[-[:alnum:]\?%,\.\/&##!;@:=\+~_]+[A-Za-z0-9\/]"; - - while (len(inputCopy)) { - result = refind(pattern,inputCopy,1,'true'); - if (result.pos[1]){ - match = mid(inputCopy,result.pos[1],result.len[1]); - urlMatches[match] = ""; - rightStart = result.len[1] + result.pos[1]; - rightInputCopyLen = len(inputCopy)-rightStart; - if (rightInputCopyLen GT 0){ - inputCopy = right(inputCopy,rightInputCopyLen); - } else break; - } else break; - } - - //convert back to array - urlMatches = structKeyArray(urlMatches); - - targetNameMax = arguments.linkmax; - for (i=1; i LTE arraylen(urlMatches);i=i+1) { - targetLinkName = urlMatches[i]; - if (len(targetLinkName) GTE targetNameMax) { - targetLinkName = left(targetLinkName,targetNameMax) & "..."; - } - inputReturn = replace(inputReturn,urlMatches[i],'#targetLinkName#',"all"); - } - - - diff --git a/client/index.cfm b/client/index.cfm index cc370ef..7a86098 100644 --- a/client/index.cfm +++ b/client/index.cfm @@ -113,7 +113,8 @@ popular view // unique ID flashvars.playerID = "#alternative#"; // load the file - flashvars.soundFile= "#application.rooturl#/enclosures/#getFileFromPath(enclosure)#"; +// flashvars.soundFile= "#application.rooturl#/enclosures/#getFileFromPath(enclosure)#"; + flashvars.soundFile= "#application.rooturl#/download.cfm/id/#id#/online/1/#urlEncodedFormat(getFileFromPath(enclosure))#"; // Load width and Height again to fix IE bug flashvars.width = "470"; flashvars.height = "24"; @@ -130,7 +131,7 @@ popular view

- [#rb("more")#] + [#request.rb("more")#]

#application.blog.renderEntry(morebody)# @@ -140,7 +141,11 @@ popular view @@ -159,7 +164,7 @@ popular view

-

#rb("relatedblogentries")#
+
#request.rb("relatedblogentries")#

@@ -235,11 +240,11 @@ popular view -
#rb("commentsnotallowed")#
+
#request.rb("commentsnotallowed")#
@@ -254,13 +259,13 @@ popular view -

#rb("sorry")#

+

#request.rb("sorry")#

- #rb("noentries")# + #request.rb("noentries")# - #rb("noentriesforcriteria")# + #request.rb("noentriesforcriteria")#

@@ -293,7 +298,7 @@ popular view #rb("preventries")# + #request.rb("preventries")#
@@ -307,7 +312,7 @@ popular view #rb("moreentries")# + #request.rb("moreentries")#
diff --git a/client/loadtweetbacks.cfm b/client/loadtweetbacks.cfm index 256bc00..9c4710a 100644 --- a/client/loadtweetbacks.cfm +++ b/client/loadtweetbacks.cfm @@ -12,10 +12,10 @@
- #paragraphFormat2(tb.text)# + #application.utils.ParagraphFormat2(tb.text)#
- #rb("postedby")# #tb.from_user# + #request.rb("postedby")# #tb.from_user# | #application.localeUtils.dateLocaleFormat(tb.created_at,"short")# #application.localeUtils.timeLocaleFormat(tb.created_at)#

diff --git a/client/mediaDisplay.cfm b/client/mediaDisplay.cfm new file mode 100644 index 0000000..8fa2984 --- /dev/null +++ b/client/mediaDisplay.cfm @@ -0,0 +1,27 @@ + + + + + + + + + select Ad_Media.MediaText, Ad_MimeTypes.MimeType + from Ad_Media join Ad_MimeTypes on (Ad_Media.MimeTypeID = Ad_MimeTypes.MimeTypeID) + where Ad_Media.mediaID = + + + + + insert into AD_MediaLog(DateDisplayed, MediaID ) + values (#createODBCDateTime(now())#, ) + + + + + + + diff --git a/client/mobile/postDetail.cfm b/client/mobile/postDetail.cfm index 93bf1b7..8385712 100644 --- a/client/mobile/postDetail.cfm +++ b/client/mobile/postDetail.cfm @@ -96,7 +96,7 @@

- #paragraphFormat2(replaceLinks(comments.comment))# + #application.utils.ParagraphFormat2(application.utils.replaceLinks(comments.comment))#

diff --git a/client/org/camden/blog/Application.cfm b/client/org/camden/blog/Application.cfm index 40465e5..8db8efd 100644 --- a/client/org/camden/blog/Application.cfm +++ b/client/org/camden/blog/Application.cfm @@ -5,7 +5,7 @@ Last Updated : History : ---> - - - - + + + + diff --git a/client/org/camden/blog/blog.cfc b/client/org/camden/blog/blog.cfc index bbb80bb..52e7739 100644 --- a/client/org/camden/blog/blog.cfc +++ b/client/org/camden/blog/blog.cfc @@ -1932,7 +1932,7 @@ select username, password, name - from tblusers + from #application.tableprefix#tblusers where blog = and username = @@ -1954,7 +1954,7 @@ select username - from tblusers + from #application.tableprefix#tblusers where name = @@ -1971,17 +1971,17 @@ select #application.tableprefix#tblblogroles.id - from #application.tableprefix#tblblogroles, #application.tableprefix#tbluserroles, tblusers - where (#application.tableprefix#tblblogroles.id = #application.tableprefix#tbluserroles.roleidfk and #application.tableprefix#tbluserroles.username = tblusers.username) - and tblusers.username = - and tblusers.blog = + from #application.tableprefix#tblblogroles, #application.tableprefix#tbluserroles, #application.tableprefix#tblusers + where (#application.tableprefix#tblblogroles.id = #application.tableprefix#tbluserroles.roleidfk and #application.tableprefix#tbluserroles.username = #application.tableprefix#tblusers.username) + and #application.tableprefix#tblusers.username = + and #application.tableprefix#tblusers.blog = select #application.tableprefix#tblblogroles.id from #application.tableprefix#tblblogroles left join #application.tableprefix#tbluserroles on #application.tableprefix#tbluserroles.roleidfk = #application.tableprefix#tblblogroles.id - left join tblusers on #application.tableprefix#tbluserroles.username = tblusers.username - where tblusers.username = - and tblusers.blog = + left join #application.tableprefix#tblusers on #application.tableprefix#tbluserroles.username = #application.tableprefix#tblusers.username + where #application.tableprefix#tblusers.username = + and #application.tableprefix#tblusers.blog = @@ -1993,7 +1993,7 @@ select username, name - from tblusers + from #application.tableprefix#tblusers where blog = @@ -2568,7 +2568,7 @@ To unsubscribe, please go to this URL: - update tblblogcategories + update #application.tableprefix#tblblogcategories set categoryname = , categoryalias = where categoryid = @@ -2785,7 +2785,7 @@ To unsubscribe, please go to this URL: - update tblusers + update #application.tableprefix#tblusers set name = diff --git a/client/org/camden/blog/blog.ini.cfm b/client/org/camden/blog/blog.ini.cfm index 0282b2a..3efef02 100644 --- a/client/org/camden/blog/blog.ini.cfm +++ b/client/org/camden/blog/blog.ini.cfm @@ -2,7 +2,7 @@ dsn=blogCFCTest username= password= -owneremail= +owneremail=info@dot-com-it.com blogURL=http://local10.blogcfc.com/client/index.cfm blogTitle=Dev Blog blogDescription=This is the development blog. @@ -10,7 +10,7 @@ blogDBType=MSSQL locale=en_US users= commentsFrom= -failTo= +failTo=info@dot-com-it.com mailserver= mailusername= mailpassword= @@ -39,3 +39,4 @@ saltAlgorithm=AES saltKeySize=256 hashAlgorithm=SHA-512 installed=yes +tableprefix= diff --git a/client/org/camden/blog/page.cfc b/client/org/camden/blog/page.cfc index c509c3c..25632f4 100644 --- a/client/org/camden/blog/page.cfc +++ b/client/org/camden/blog/page.cfc @@ -43,9 +43,9 @@ - select tblblogcategories.categoryID, tblblogcategories.categoryname - from tblblogcategories, #application.tableprefix#tblblogpagescategories - where tblblogcategories.categoryID = #application.tableprefix#tblblogpagescategories.categoryidfk + select #application.tableprefix#tblblogcategories.categoryID, #application.tableprefix#tblblogcategories.categoryname + from #application.tableprefix#tblblogcategories, #application.tableprefix#tblblogpagescategories + where #application.tableprefix#tblblogcategories.categoryID = #application.tableprefix#tblblogpagescategories.categoryidfk and #application.tableprefix#tblblogpagescategories.pageidfk = diff --git a/client/org/camden/blog/utils.cfc b/client/org/camden/blog/utils.cfc index 9229eff..0f4a49e 100644 --- a/client/org/camden/blog/utils.cfc +++ b/client/org/camden/blog/utils.cfc @@ -227,10 +227,39 @@ return false; } } - request.udf.arrayDefinedAt = arrayDefinedAt; + +/** + * Returns a relative path from the current template to an absolute file path. + * + * @param abspath Absolute path. (Required) + * @return Returns a string. + * @author Isaac Dealey (info@turnkey.to) + * @version 1, May 2, 2003 + */ + function getRelativePath(abspath){ + var aHere = listtoarray(expandPath("/"),"\/"); + var aThere = ""; var lenThere = 0; + var aRel = ArrayNew(1); var x = 0; + var newpath = ""; + + aThere = ListToArray(abspath,"\/"); lenThere = arraylen(aThere); + + for (x = 1; x lte arraylen(aHere); x = x + 1) { + if (x GT lenThere OR comparenocase(aHere[x],aThere[x])) { + ArrayPrepend(aRel,".."); if (x lte lenThere) { ArrayAppend(aRel,aThere[x]); } + } + } + + for (; x lte arraylen(aThere); x = x + 1) { ArrayAppend(aRel,aThere[x]); } + + newpath = "/" & ArrayToList(aRel,"/"); + + return newpath; + } + diff --git a/client/print.cfm b/client/print.cfm index 79ae4ac..de4aa60 100644 --- a/client/print.cfm +++ b/client/print.cfm @@ -47,9 +47,9 @@

#entry.title#

-