diff --git a/README.md b/README.md index a187c0f5..1d17657c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ roncli.com ========== -This is the source repository for the [roncli.com](http://www.roncli.com) website. This website is written in [node.js](http://nodejs.org) using the [rendr](https://github.com/rendrjs/rendr) library. +This is the source repository for the [roncli.com](https://roncli.com) website. This website is written in [node.js](https://nodejs.org) using the [rendr](https://github.com/rendrjs/rendr) library. Projects ======== @@ -15,7 +15,7 @@ The second is the Node project itself, which is developed via PhpStorm. I do ha Requirements ============ -Be sure to have [Visual Studio 2013](http://www.visualstudio.com) with [Node.js Tools for Visual Studio](http://nodejstools.codeplex.com). and node.js 0.10.36 or later installed with npm. +Be sure to have [Visual Studio 2013](https://www.visualstudio.com) with [Node.js Tools for Visual Studio](https://nodejstools.codeplex.com). and node.js 0.10.36 or later installed with npm. Database Setup ============== @@ -34,27 +34,21 @@ Windows Installation To run the website on Windows, make sure you perform the following steps. 1. Install [Python 2.7.x](https://www.python.org/downloads/). -2. Download the all-in-one bundle for [GTK+ 2.x x86](http://ftp.acc.umu.se/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip) or [GTK+ 2.x x64](http://ftp.acc.umu.se/pub/gnome/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip). -3. Unzip the GTK+ 2.x directory to c:\GTK. It is important that the files are in this directory, as that is where the canvas npm package will be looking for it. -4. Add the c:\GTK\bin\ directory to your system PATH. (This may require a restart.) -5. From an admin command prompt, install node-gyp and grunt-cli globally: +2. Add the c:\GTK\bin\ directory to your system PATH. (This may require a restart.) +3. From an admin command prompt, install grunt-cli globally: - npm install -g node-gyp grunt-cli - -6. Install the windows build tools globally: - - npm install -g --production windows-build-tools + npm install -g grunt-cli -7. Install the node modules from the /roncli.com directory: +4. Install the node modules from the /roncli.com directory: npm install -8. Add /roncli.com/assets/js/publicConfig.js and /roncli.com/server/privateConfig.js. See below for file contents. -9. Install the node modules from the /ronc.li directory: +5. Add /roncli.com/assets/js/publicConfig.js and /roncli.com/server/privateConfig.js. See below for file contents. +6. Install the node modules from the /ronc.li directory: npm install -10. If using [iisnode](https://github.com/tjanczuk/iisnode): +7. If using [iisnode](https://github.com/tjanczuk/iisnode): - Point an IIS application to the inner /roncli.com directory - Point another IIS application to the /ronc.li directory - Run ```grunt``` from the same directory when installing and after every time you change code. @@ -170,6 +164,16 @@ The following should be the contents of privateConfig.js: Version History =============== +1.0.8 - 7/13/2019 +----------------- + +This release sets up the website to work over SSL, removes references to Google Plus, and replaces the captcha system with one that requires less of a setup on Windows. + +* Most URLs changed from http to https. +* Replace captchagen with svg-captcha. +* Removed references to Google Plus. +* Replaced Internet Explorer with Edge as a recommended browser. + 1.0.7 - 1/8/2019 ---------------- @@ -309,6 +313,7 @@ Planned Versions 1.1 --- +* Remove Visual Studio projects. * Allow for a directory structure in the files section. * Add résumé page. @@ -317,6 +322,4 @@ License Details All original code is released without license. This means that you may not distribute the code without the express written consent of the author. -Because the code resides on GitHub, you are permitted via GitHub's [Terms of Service](http://help.github.com/articles/github-terms-of-service) to view and fork this repository. - -©2014-2015 Ronald M. Clifford +Because the code resides on GitHub, you are permitted via GitHub's [Terms of Service](https://help.github.com/articles/github-terms-of-service) to view and fork this repository. diff --git a/ronc.li/index.js b/ronc.li/index.js index b1749383..2370dbf3 100644 --- a/ronc.li/index.js +++ b/ronc.li/index.js @@ -18,6 +18,9 @@ app.use(function(req, res, next) { // Initialize middleware stack. app.use(morgan(":colorstatus \x1b[30m\x1b[1m:method\x1b[0m :url\x1b[30m\x1b[1m:newline Date :date[iso] IP :req[ip] Time :colorresponse ms")); +// Web server routes. +app.use(express.static("public")); + // Redirect. app.get("*", function(req, res) { var url = req.url; @@ -32,7 +35,7 @@ app.get("*", function(req, res) { } if (err || !data || !data.recordsets || !data.recordsets[0] || !data.recordsets[0][0] || !data.recordsets[0][0].ToURL) { - res.redirect(301, "http://www.roncli.com" + url); + res.redirect(301, req.protocol + "://roncli.com" + url); } else { db.query( "INSERT INTO tblRedirectHit (RedirectID, IP, Referrer, UserAgent) values (@redirectId, @ip, @referrer, @userAgent)", diff --git a/ronc.li/package.json b/ronc.li/package.json index 8803bf82..01524ff7 100644 --- a/ronc.li/package.json +++ b/ronc.li/package.json @@ -1,6 +1,6 @@ { "name": "ronc.li", - "version": "1.0.7", + "version": "1.0.8", "description": "Redirect service for roncli.com.", "homepage": "https://github.com/roncli/roncli.com", "bugs": { @@ -11,7 +11,7 @@ "author": { "name": "Ronald M. Clifford", "email": "roncli@roncli.com", - "url": "http://www.roncli.com" + "url": "https://roncli.com" }, "repository": { "type": "git", diff --git a/ronc.li/web.config b/ronc.li/web.config index 726167cf..debbe119 100644 --- a/ronc.li/web.config +++ b/ronc.li/web.config @@ -10,6 +10,13 @@ + + + + + + + diff --git a/roncli.com/README.md b/roncli.com/README.md index a036804e..d733f84a 100644 --- a/roncli.com/README.md +++ b/roncli.com/README.md @@ -1,5 +1,5 @@ Notes ===== -* Color palette is from [paletton.com](http://paletton.com/#uid=43+1m0kka9zdKffgRcglUdjnGge). -* Bootstrap theme is custom made via [Bootstrap Customizer](http://getbootstrap.com/customize/?id=c209005f2b4bc66654b5). +* Color palette is from [paletton.com](https://paletton.com/#uid=43+1m0kka9zdKffgRcglUdjnGge). +* Bootstrap theme is custom made via [Bootstrap Customizer](https://getbootstrap.com/customize/?id=c209005f2b4bc66654b5). diff --git a/roncli.com/admin/templates/admin/coding.hbs b/roncli.com/admin/templates/admin/coding.hbs index 485d0d88..c181bef1 100644 --- a/roncli.com/admin/templates/admin/coding.hbs +++ b/roncli.com/admin/templates/admin/coding.hbs @@ -86,7 +86,7 @@
Project URL: - +
GitHub URL: diff --git a/roncli.com/admin/templates/admin/project.hbs b/roncli.com/admin/templates/admin/project.hbs index ee520515..f20fc679 100644 --- a/roncli.com/admin/templates/admin/project.hbs +++ b/roncli.com/admin/templates/admin/project.hbs @@ -12,7 +12,7 @@
Project URL: - +
GitHub URL: diff --git a/roncli.com/app/app.js b/roncli.com/app/app.js index 8803eca3..d4a36445 100644 --- a/roncli.com/app/app.js +++ b/roncli.com/app/app.js @@ -1029,7 +1029,7 @@ module.exports = BaseApp.extend({ $.ajax({ dataType: "json", - url: "http://" + window.location.host + "/api/-/youtube/get-video-info?videoId=" + media.videoId, + url: window.location.protocol + "//" + window.location.host + "/api/-/youtube/get-video-info?videoId=" + media.videoId, success: function(data) { media.title = data.channelTitle + " - " + data.title; deferred.resolve(); diff --git a/roncli.com/app/controllers/blog_controller.js b/roncli.com/app/controllers/blog_controller.js index 3060c443..f64eb542 100644 --- a/roncli.com/app/controllers/blog_controller.js +++ b/roncli.com/app/controllers/blog_controller.js @@ -32,17 +32,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "This is the roncli.com Blog.", - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": "The roncli.com Blog", "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/blog", + "og:url": app.req.protocol + "://" + app.req.headers.host + "/blog", "twitter:card": "summary", "twitter:description": "This is the roncli.com Blog.", - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": "The roncli.com Blog", - "twitter:url": "http://" + app.req.headers.host + "/blog" + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/blog" }; } callback(err, result); @@ -79,17 +79,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "This is the " + decodeURIComponent(params[0]) + " category of the roncli.com Blog.", - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": "The roncli.com Blog - " + decodeURIComponent(params[0]), "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/blog/category/" + params[0], + "og:url": app.req.protocol + "://" + app.req.headers.host + "/blog/category/" + params[0], "twitter:card": "summary", "twitter:description": "This is the " + decodeURIComponent(params[0]) + " category of the roncli.com Blog.", - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": "The roncli.com Blog - " + decodeURIComponent(params[0]), - "twitter:url": "http://" + app.req.headers.host + "/blog/category/" + params[0] + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/blog/category/" + params[0] }; } callback(err, result); @@ -162,23 +162,23 @@ module.exports = { content = content.substr(0, 197).trim() + "..."; } result.meta = { - "article:author": "http://www.facebook.com/roncli", + "article:author": "https://www.facebook.com/roncli", "article:published_time": moment(post.published * 1000).format(), - "article:publisher": "http://www.facebook.com/roncli", + "article:publisher": "https://www.facebook.com/roncli", "article:section": "Blog", "article:tag": post.categories, "og:description": content, - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": post.blogTitle || "The roncli.com Blog", "og:type": "article", - "og:url": "http://" + app.req.headers.host + "/" + params[0], + "og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0], "twitter:card": "summary", "twitter:description": content, - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": post.blogTitle || "The roncli.com Blog", - "twitter:url": "http://" + app.req.headers.host + "/" + params[0] + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0] }; } callback(err, result); diff --git a/roncli.com/app/controllers/coding_controller.js b/roncli.com/app/controllers/coding_controller.js index e81d7ea7..69bb2e7f 100644 --- a/roncli.com/app/controllers/coding_controller.js +++ b/roncli.com/app/controllers/coding_controller.js @@ -36,17 +36,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "Discover roncli's many coding projects. See recent code commits, project releases, and more.", - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": "roncli.com Coding Projects", "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/coding", + "og:url": app.req.protocol + "://" + app.req.headers.host + "/coding", "twitter:card": "summary", "twitter:description": "Discover roncli's many coding projects. See recent code commits, project releases, and more.", - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": "roncli.com Coding Projects", - "twitter:url": "http://" + app.req.headers.host + "/coding" + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/coding" }; } callback(err, result); @@ -90,17 +90,17 @@ module.exports = { result.meta = { "og:description": content, - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": result.project.attributes.title, "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/" + params[0], + "og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0], "twitter:card": "summary", "twitter:description": content, - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": result.project.attributes.title, - "twitter:url": "http://" + app.req.headers.host + "/" + params[0] + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0] }; } callback(err, result); diff --git a/roncli.com/app/controllers/default_controller.js b/roncli.com/app/controllers/default_controller.js index 63293f6e..7bd66745 100644 --- a/roncli.com/app/controllers/default_controller.js +++ b/roncli.com/app/controllers/default_controller.js @@ -34,20 +34,20 @@ module.exports = { } result.meta = { - "article:author": "http://www.facebook.com/roncli", - "article:publisher": "http://www.facebook.com/roncli", + "article:author": "https://www.facebook.com/roncli", + "article:publisher": "https://www.facebook.com/roncli", "og:description": content, - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": page.title, "og:type": "article", - "og:url": "http://" + app.req.headers.host + "/" + params[0], + "og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0], "twitter:card": "summary", "twitter:description": content, - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": page.title, - "twitter:url": "http://" + app.req.headers.host + "/" + params[0] + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0] }; } diff --git a/roncli.com/app/controllers/files_controller.js b/roncli.com/app/controllers/files_controller.js index 49a9b8c8..e182f481 100644 --- a/roncli.com/app/controllers/files_controller.js +++ b/roncli.com/app/controllers/files_controller.js @@ -26,17 +26,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "Files on roncli.com.", - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": "roncli.com Files", "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/files", + "og:url": app.req.protocol + "://" + app.req.headers.host + "/files", "twitter:card": "summary", "twitter:description": "Files on roncli.com.", - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": "roncli.com Files", - "twitter:url": "http://" + app.req.headers.host + "/files" + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/files" }; } callback(err, result); diff --git a/roncli.com/app/controllers/gaming_controller.js b/roncli.com/app/controllers/gaming_controller.js index d127449a..99f5525e 100644 --- a/roncli.com/app/controllers/gaming_controller.js +++ b/roncli.com/app/controllers/gaming_controller.js @@ -66,17 +66,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "Games roncli plays.", - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": "roncli Gaming", "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/gaming", + "og:url": app.req.protocol + "://" + app.req.headers.host + "/gaming", "twitter:card": "summary", "twitter:description": "Games roncli plays", - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": "roncli Gaming", - "twitter:url": "http://" + app.req.headers.host + "/gaming" + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/gaming" }; } callback(err, result); @@ -113,17 +113,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "roncli's game stats for " + result.game.attributes.name, - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": result.game.attributes.name, "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/" + params[0], + "og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0], "twitter:card": "summary", "twitter:description": "roncli's game stats for " + result.game.attributes.name, - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": result.game.attributes.name, - "twitter:url": "http://" + app.req.headers.host + "/" + params[0] + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0] }; } callback(err, result); diff --git a/roncli.com/app/controllers/home_controller.js b/roncli.com/app/controllers/home_controller.js index b57147ef..acd61d77 100644 --- a/roncli.com/app/controllers/home_controller.js +++ b/roncli.com/app/controllers/home_controller.js @@ -67,17 +67,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "This is the homepage of Ronald M. Clifford.", - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": "The roncli.com Website", "og:type": "website", - "og:url": "http://" + app.req.headers.host, + "og:url": app.req.protocol + "://" + app.req.headers.host, "twitter:card": "summary", "twitter:description": "This is the homepage of Ronald M. Clifford.", - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": "The roncli.com Website", - "twitter:url": "http://" + app.req.headers.host + "twitter:url": app.req.protocol + "://" + app.req.headers.host }; } callback(err, result); diff --git a/roncli.com/app/controllers/music_controller.js b/roncli.com/app/controllers/music_controller.js index c7e77658..81102e93 100644 --- a/roncli.com/app/controllers/music_controller.js +++ b/roncli.com/app/controllers/music_controller.js @@ -36,17 +36,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "This is the home of roncli, The Nightstalker. Listen to all of The Nightstalker's releases here.", - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": "The Home of The Nightstalker", "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/music", + "og:url": app.req.protocol + "://" + app.req.headers.host + "/music", "twitter:card": "summary", "twitter:description": "This is the home of roncli, The Nightstalker. Listen to all of The Nightstalker's releases here.", - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": "The Home of The Nightstalker", - "twitter:url": "http://" + app.req.headers.host + "/music" + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/music" }; } callback(err, result); @@ -83,17 +83,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": "This is the music of The Nightstalker with the " + decodeURIComponent(params[0]) + " tag.", - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": "The Home of The Nightstalker - " + decodeURIComponent(params[0]), "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/music/tag/" + decodeURIComponent(params[0]), + "og:url": app.req.protocol + "://" + app.req.headers.host + "/music/tag/" + decodeURIComponent(params[0]), "twitter:card": "summary", "twitter:description": "This is the music of The Nightstalker with the " + decodeURIComponent(params[0]) + " tag.", - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": "The Home of The Nightstalker - " + decodeURIComponent(params[0]), - "twitter:url": "http://" + app.req.headers.host + "/music/tag/" + decodeURIComponent(params[0]) + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/music/tag/" + decodeURIComponent(params[0]) }; } result.tag = params[0]; @@ -144,8 +144,8 @@ module.exports = { "og:site_name": "roncli.com", "og:title": result.song.attributes.title, "og:type": "soundcloud:sound", - "og:url": "http://" + app.req.headers.host + "/" + params[0], - "og:video": "http://player.soundcloud.com/player.swf?url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F" + result.song.attributes.id + "&auto_play=false&show_artwork=true&visual=true&color=3b5998&origin=facebook", + "og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0], + "og:video": "https://player.soundcloud.com/player.swf?url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F" + result.song.attributes.id + "&auto_play=false&show_artwork=true&visual=true&color=3b5998&origin=facebook", "og:video:height": "98", "og:video:type": "application/x-shockwave-flash", "og:video:width": "460", @@ -163,7 +163,7 @@ module.exports = { "twitter:player:width": "435", "twitter:site": "@roncli", "twitter:title": result.song.attributes.title, - "twitter:url": "http://" + app.req.headers.host + "/" + params[0] + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0] }; } callback(err, result); diff --git a/roncli.com/app/controllers/playlist_controller.js b/roncli.com/app/controllers/playlist_controller.js index b34eb527..47e9b37a 100644 --- a/roncli.com/app/controllers/playlist_controller.js +++ b/roncli.com/app/controllers/playlist_controller.js @@ -31,17 +31,17 @@ module.exports = { if (app.req) { result.meta = { "og:description": result.playlist.attributes.info.snippet.description, - "og:image": "http://" + app.req.headers.host + "/images/favicon.png", + "og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "og:site_name": "roncli.com", "og:title": result.playlist.attributes.info.snippet.title, "og:type": "website", - "og:url": "http://" + app.req.headers.host + "/" + params[0], + "og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0], "twitter:card": "summary", "twitter:description": result.playlist.attributes.info.snippet.description, - "twitter:image": "http://" + app.req.headers.host + "/images/favicon.png", + "twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png", "twitter:site": "@roncli", "twitter:title": result.playlist.attributes.info.snippet.title, - "twitter:url": "http://" + app.req.headers.host + "/" + params[0] + "twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0] }; } callback(err, result); diff --git a/roncli.com/app/lib/handlebarsHelpers.js b/roncli.com/app/lib/handlebarsHelpers.js index a3b7a4ab..4d5ee64d 100644 --- a/roncli.com/app/lib/handlebarsHelpers.js +++ b/roncli.com/app/lib/handlebarsHelpers.js @@ -136,7 +136,7 @@ module.exports = function(Handlebars) { * @returns {string} The Twitter profile of the user. */ toTwitterProfileUrl: function(user) { - return "http://twitter.com/" + user; + return "https://twitter.com/" + user; }, /** @@ -146,7 +146,7 @@ module.exports = function(Handlebars) { * @returns {string} The permanent URL of the tweet. */ toTwitterPermanentUrl: function(user, id) { - return "http://twitter.com/" + user + "/status/" + id; + return "https://twitter.com/" + user + "/status/" + id; }, /** @@ -155,7 +155,7 @@ module.exports = function(Handlebars) { * @returns {string} The URL to use to reply to a tweet. */ toTwitterReplyUrl: function(id) { - return "http://twitter.com/intent/tweet?in_reply_to=" + id; + return "https://twitter.com/intent/tweet?in_reply_to=" + id; }, /** @@ -164,7 +164,7 @@ module.exports = function(Handlebars) { * @returns {string} The URL to use to retweet a tweet. */ toTwitterRetweetUrl: function(id) { - return "http://twitter.com/intent/retweet?tweet_id=" + id; + return "https://twitter.com/intent/retweet?tweet_id=" + id; }, /** @@ -173,7 +173,7 @@ module.exports = function(Handlebars) { * @returns {string} The URL to use to favorite a tweet. */ toTwitterFavoriteUrl: function(id) { - return "http://twitter.com/intent/favorite?tweet_id=" + id; + return "https://twitter.com/intent/favorite?tweet_id=" + id; }, /** diff --git a/roncli.com/app/router.js b/roncli.com/app/router.js index ce1134ea..84af0680 100644 --- a/roncli.com/app/router.js +++ b/roncli.com/app/router.js @@ -74,8 +74,7 @@ Router.prototype.actionEnd = function() { // Update sharing URLs. sharing.find("a.facebook-share").attr("href", "https://www.facebook.com/sharer/sharer.php?u=" + encodeURIComponent(window.location.href)); sharing.find("a.twitter-share").attr("href", "https://twitter.com/home?status=" + encodeURIComponent(window.location.href)); - sharing.find("a.gplus-share").attr("href", "https://plus.google.com/share?url=" + encodeURIComponent(window.location.href)); - sharing.find("a.tumblr-share").attr("href", "http://www.tumblr.com/share/link?url=" + encodeURIComponent(window.location.href)); + sharing.find("a.tumblr-share").attr("href", "https://www.tumblr.com/share/link?url=" + encodeURIComponent(window.location.href)); // Tracks a page view with Google Analytics. if (window._gaq) { diff --git a/roncli.com/app/templates/__layout.hbs b/roncli.com/app/templates/__layout.hbs index b39aa603..53f5d321 100644 --- a/roncli.com/app/templates/__layout.hbs +++ b/roncli.com/app/templates/__layout.hbs @@ -10,7 +10,6 @@ {{/each}} - @@ -56,7 +55,7 @@ Life
- +
- @roncli + @roncli
Contacts
- Battle.Net + Battle.Net Email - Facebook + Facebook Flickr GitHub - Google+ - SoundCloud - Steam - Tumblr - Twitch - Twitter - YouTube + SoundCloud + Steam + Tumblr + Twitch + Twitter + YouTube
@@ -104,15 +102,15 @@
diff --git a/roncli.com/app/templates/blog/index.hbs b/roncli.com/app/templates/blog/index.hbs index 3d246e12..8fd8da38 100644 --- a/roncli.com/app/templates/blog/index.hbs +++ b/roncli.com/app/templates/blog/index.hbs @@ -39,7 +39,7 @@
Subscribe to this blog:
-
+
diff --git a/roncli.com/app/templates/coding/index.hbs b/roncli.com/app/templates/coding/index.hbs index 5b9b5c15..868b3c89 100644 --- a/roncli.com/app/templates/coding/index.hbs +++ b/roncli.com/app/templates/coding/index.hbs @@ -67,7 +67,7 @@
Subscribe to my code commits and project releases:
-
+
diff --git a/roncli.com/app/templates/gaming/game.hbs b/roncli.com/app/templates/gaming/game.hbs index bab37fc5..eedc1e7c 100644 --- a/roncli.com/app/templates/gaming/game.hbs +++ b/roncli.com/app/templates/gaming/game.hbs @@ -55,7 +55,7 @@
Welcome to the world of roncli Gaming. Learn about all of the games I play, watch past videos of me playing, and find out what I'm up to in each game.

- Also, be sure to follow me on Twitch and watch live! + Also, be sure to follow me on Twitch and watch live!
{{partial "site/share"}} diff --git a/roncli.com/app/templates/gaming/index.hbs b/roncli.com/app/templates/gaming/index.hbs index c1d2eeb0..e19a66be 100644 --- a/roncli.com/app/templates/gaming/index.hbs +++ b/roncli.com/app/templates/gaming/index.hbs @@ -33,7 +33,7 @@

Six Gaming

- Six Gaming is an organization dedicated to gaming. It was born from my old Six Minutes To Release World of Warcraft raiding guild. Currently, it is home of the Six Gaming Podcast, a podcast dedicated to all things gaming. I am one of the podcast's co-hosts.

+ Six Gaming is an organization dedicated to gaming. It was born from my old Six Minutes To Release World of Warcraft raiding guild. Currently, it is home of the Six Gaming Podcast, a podcast dedicated to all things gaming. I am one of the podcast's co-hosts.

The Six Gaming Podcast

Catch the Six Gaming Podcast on YouTube Saturdays at 11 PM Eastern/8 PM Pacific. Here are the highlights from our most recent episode.

@@ -55,10 +55,10 @@
- Roncli <For Honor>
+ Roncli <For Honor>
Human Paladin
{{{wow.models.0.attributes.character.achievementPoints}}} Achievement Points

- I have been playing World of Warcraft since November 2006, just before the first expansion Burning Crusade came out. I ran the guild Six Minutes To Release for just over 7 years up until February of 2015, which spawned the Six Gaming brand. I am currently raiding with the guild For Honor. + I have been playing World of Warcraft since November 2006, just before the first expansion Burning Crusade came out. I ran the guild Six Minutes To Release for just over 7 years up until February of 2015, which spawned the Six Gaming brand. I am currently raiding with the guild For Honor.

Character Feed

{{#each wow.models.0.attributes.feedItems}} @@ -116,7 +116,7 @@ {{else}}
- I've played Diablo III since beta fairly regularly. I am the leader of the Six Gaming clan, which consists mostly of former Six Minutes To Release members and friends. + I've played Diablo III since beta fairly regularly. I am the leader of the Six Gaming clan, which consists mostly of former Six Minutes To Release members and friends.

Heroes

@@ -126,7 +126,7 @@
- + {{#if attributes.seasonal}}Seasonal {{/if}} {{#if attributes.hardcore}}Hardcore {{/if}} {{attributes.class}} {{attributes.name}} @@ -157,13 +157,13 @@
- I've been playing Descent, Descent 2, and Descent 3 since they were released, in 1995, 1996, and 1999 respectively. I have also backed the next game in the series, Descent: Underground, from Descendent Studios via Kickstarter.

- When Descent 3 was released, I joined the Wildcards Empire and earned their top pilot status in Descent and Descent 3, Death Squadron Elite. I also played for Team X and Nightwing over the years. I took over the Descent 3 Teams League in 2002 and ran it for several years, running the D3TL Tournament, which was a 16-team league that lasted 4-month in which everyone played 16 games. Although 4 teams dropped out, it still remains the largest organized team tournament for Descent 3. Most recently, I've joined the Descent Rangers to help get active into playing again with the upcoming Descent: Underground title around the corner.

- Because Descent and Descent 2 were released such a long time ago, there are some modifications that you need to make to get the game to work on modern systems. After installing the games, either from media, on Steam, or on gog.com, you will need to visit dxx-rebirth.com to get the latest source port that runs on modern machines. You will also want to install the Retro package as part of the installation, or you can grab it from the Descent Rangers downloads section. + I've been playing Descent, Descent 2, and Descent 3 since they were released, in 1995, 1996, and 1999 respectively. I have also backed the next game in the series, Descent: Underground, from Descendent Studios via Kickstarter.

+ When Descent 3 was released, I joined the Wildcards Empire and earned their top pilot status in Descent and Descent 3, Death Squadron Elite. I also played for Team X and Nightwing over the years. I took over the Descent 3 Teams League in 2002 and ran it for several years, running the D3TL Tournament, which was a 16-team league that lasted 4-month in which everyone played 16 games. Although 4 teams dropped out, it still remains the largest organized team tournament for Descent 3. Most recently, I've joined the Descent Rangers to help get active into playing again with the upcoming Descent: Underground title around the corner.

+ Because Descent and Descent 2 were released such a long time ago, there are some modifications that you need to make to get the game to work on modern systems. After installing the games, either from media, on Steam, or on gog.com, you will need to visit dxx-rebirth.com to get the latest source port that runs on modern machines. You will also want to install the Retro package as part of the installation, or you can grab it from the Descent Rangers downloads section.

Descent Champions Ladder

- The Descent Champions Ladder is an active Descent league that ranks each player via a ladder system. If you defeat a player higher than you, you take their spot. Players are also rated based on performance, and you can get a litany of stats about their games. I stream my DCL matches on Twitch and then move them to YouTube afterwards. An average DCL game is about 20 minutes, but can vary depending on the size of the map and aggression of the players involved.

+ The Descent Champions Ladder is an active Descent league that ranks each player via a ladder system. If you defeat a player higher than you, you take their spot. Players are also rated based on performance, and you can get a litany of stats about their games. I stream my DCL matches on Twitch and then move them to YouTube afterwards. An average DCL game is about 20 minutes, but can vary depending on the size of the map and aggression of the players involved.

{{#if dclMissing}} Descent Champions Ladder data is currently unavailable. @@ -264,7 +264,7 @@
Welcome to the world of roncli Gaming. Learn about all of the games I play, watch past videos of me playing, and find out what I'm up to in each game.

- Also, be sure to follow me on Twitch and watch live! + Also, be sure to follow me on Twitch and watch live!
@@ -272,7 +272,7 @@
Subscribe to get roncli's latest gaming videos and updates:
-
+
diff --git a/roncli.com/app/templates/home/index.hbs b/roncli.com/app/templates/home/index.hbs index ef4af6d5..5e6ed6a4 100644 --- a/roncli.com/app/templates/home/index.hbs +++ b/roncli.com/app/templates/home/index.hbs @@ -225,12 +225,12 @@
Subscribe to these RSS feeds for the latest on each topic.

- Blog


- Coding
 + Blog


+ Coding
- Music


- Gaming
 + Music


+ Gaming
diff --git a/roncli.com/app/templates/music/index.hbs b/roncli.com/app/templates/music/index.hbs index 47c29966..6134ecb8 100644 --- a/roncli.com/app/templates/music/index.hbs +++ b/roncli.com/app/templates/music/index.hbs @@ -109,7 +109,7 @@
Subscribe to The Nightstalker's music:
-
+
diff --git a/roncli.com/app/templates/music/tag.hbs b/roncli.com/app/templates/music/tag.hbs index f441a2b3..f994c451 100644 --- a/roncli.com/app/templates/music/tag.hbs +++ b/roncli.com/app/templates/music/tag.hbs @@ -51,7 +51,7 @@
Subscribe to The Nightstalker's {{tag}} songs:
-
+
diff --git a/roncli.com/app/templates/playlist/video.hbs b/roncli.com/app/templates/playlist/video.hbs index 11ebd8e8..888d0b90 100644 --- a/roncli.com/app/templates/playlist/video.hbs +++ b/roncli.com/app/templates/playlist/video.hbs @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/roncli.com/app/templates/site/login.hbs b/roncli.com/app/templates/site/login.hbs index 6c71aab7..3674f213 100644 --- a/roncli.com/app/templates/site/login.hbs +++ b/roncli.com/app/templates/site/login.hbs @@ -51,8 +51,8 @@
- -
(COPPA) DOB:
+ +
(COPPA) DOB:
 diff --git a/roncli.com/app/templates/site/share.hbs b/roncli.com/app/templates/site/share.hbs index 7cd906c6..c0410ffd 100644 --- a/roncli.com/app/templates/site/share.hbs +++ b/roncli.com/app/templates/site/share.hbs @@ -1,9 +1,8 @@
Share This Page
diff --git a/roncli.com/assets/css/bootstrap-theme.css b/roncli.com/assets/css/bootstrap-theme.css index 6062847f..12736e62 100644 --- a/roncli.com/assets/css/bootstrap-theme.css +++ b/roncli.com/assets/css/bootstrap-theme.css @@ -1,11 +1,11 @@ /*! - * Bootstrap v3.3.2 (http://getbootstrap.com) + * Bootstrap v3.3.2 (https://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! - * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=fb9e752fd3bdc9bc7d15) + * Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=fb9e752fd3bdc9bc7d15) * Config saved to config.json and https://gist.github.com/fb9e752fd3bdc9bc7d15 */ .btn-default, diff --git a/roncli.com/assets/css/bootstrap.css b/roncli.com/assets/css/bootstrap.css index 0bc96a6b..e543f04e 100644 --- a/roncli.com/assets/css/bootstrap.css +++ b/roncli.com/assets/css/bootstrap.css @@ -1,11 +1,11 @@ /*! - * Bootstrap v3.3.2 (http://getbootstrap.com) + * Bootstrap v3.3.2 (https://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! - * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=c15eff64268d6966571a) + * Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=c15eff64268d6966571a) * Config saved to config.json and https://gist.github.com/c15eff64268d6966571a */ /*! normalize.css v3.0.2 | MIT License | git.io/normalize */ diff --git a/roncli.com/assets/css/site.css b/roncli.com/assets/css/site.css index aa6dd4ef..b4576d67 100644 --- a/roncli.com/assets/css/site.css +++ b/roncli.com/assets/css/site.css @@ -340,10 +340,6 @@ div.tweets div.hr { background-image: url("/images/facebook.png"); } -.bookmark-gplus { - background-image: url("/images/gplus.png"); -} - .bookmark-rss { background-image: url("/images/rss.png"); } @@ -365,10 +361,6 @@ div.tweets div.hr { background-image: url("/images/facebook@2x.png"); } - .bookmark-gplus { - background-image: url("/images/gplus@2x.png"); - } - .bookmark-rss { background-image: url("/images/rss@2x.png"); } diff --git a/roncli.com/assets/js/jquery-defaultButton-1.2.0.min.js b/roncli.com/assets/js/jquery-defaultButton-1.2.0.min.js index 3f762604..6ac62490 100644 --- a/roncli.com/assets/js/jquery-defaultButton-1.2.0.min.js +++ b/roncli.com/assets/js/jquery-defaultButton-1.2.0.min.js @@ -6,6 +6,6 @@ * ©2010-2011 Ronald M. Clifford (roncli@roncli.com) * * Licensed under the MIT license: - * http://www.opensource.org/licenses/mit-license.php + * https://www.opensource.org/licenses/mit-license.php */ (function(a){"use strict";a.fn.defaultButton=function(b){var c=this;a(c).off("keypress").on("keypress",function(c){var d=c.which,e=c.keyCode;if(c.target.nodeName==="INPUT"&&(d&&d===13||e&&e===13)){a(b).click();return true}});return c}})(jQuery) diff --git a/roncli.com/assets/js/jquery-getParam.min.js b/roncli.com/assets/js/jquery-getParam.min.js index f0766282..af09ed5e 100644 --- a/roncli.com/assets/js/jquery-getParam.min.js +++ b/roncli.com/assets/js/jquery-getParam.min.js @@ -1,2 +1,2 @@ -// Originally by K_Wasseem from http://7php.com/javascript-using-jquery-to-find-url-querystring-or-url-params-a-simple-yet-effective-approach/ +// Originally by K_Wasseem from https://7php.com/javascript-using-jquery-to-find-url-querystring-or-url-params-a-simple-yet-effective-approach/ (function(e){e.getParam=function(e){var t=decodeURI(window.location.search.substring(1));if(!t||t===""){return e?null:{}}var n=t.split("&");var r={};for(var i=0;i - - diff --git a/roncli.com/server/captcha/captchagen.js b/roncli.com/server/captcha/captchagen.js deleted file mode 100644 index 3805ca4c..00000000 --- a/roncli.com/server/captcha/captchagen.js +++ /dev/null @@ -1,116 +0,0 @@ -// Require the captchagen object. -var captchagen = require("captchagen"); - -// Update captchagen middlewear. -captchagen.getColors = function(count, min, max) { - "use strict"; - - var colors = [], - i, color; - for (i = 0; i < count; i++) { - color = { - r: Math.floor(Math.random() * (1 + max - min)) + min, - g: Math.floor(Math.random() * (1 + max - min)) + min, - b: Math.floor(Math.random() * (1 + max - min)) + min - }; - color.css = "rgb(" + color.r + "," + color.g + "," + color.b + ")"; - colors.push(color); - } - return colors; -}; - -captchagen.drawBackground = function(canvas, opt) { - "use strict"; - - var ctx = canvas.getContext("2d"), - colors = captchagen.getColors(2, 0, 127), - gradient = ctx.createLinearGradient(0, 0, opt.width, 0); - - gradient.addColorStop(0, colors[0].css); - gradient.addColorStop(1, colors[1].css); - - ctx.fillStyle = gradient; - ctx.fillRect(0, 0, opt.width, opt.height); - return canvas; -}; - -captchagen.drawLines = function(canvas, opt) { - "use strict"; - - var ctx = canvas.getContext("2d"), - colors = captchagen.getColors(Math.floor(Math.random() * 4) + 1, 0, 128); - - colors.forEach(function(color) - { - ctx.beginPath(); - ctx.moveTo(Math.floor(Math.random() * opt.width), Math.floor(Math.random() * opt.height)); - ctx.bezierCurveTo(Math.floor(Math.random() * opt.height), Math.floor(Math.random() * opt.height), Math.floor(Math.random() * opt.width), Math.floor(Math.random() * opt.height), Math.floor(Math.random() * opt.width), Math.floor(Math.random() * opt.height)); - - ctx.fillStyle = ctx.strokeStyle = color.css; - ctx.lineWidth = captchagen.getColors(Math.floor(Math.random() * 4) + 2); - return ctx.stroke(); - }); - return canvas; -}; - -captchagen.drawText = function(canvas, opt) { - "use strict"; - - var ctx = canvas.getContext("2d"), - colors = captchagen.getColors(opt.text.length, 128, 255), - x = 25; - - opt.text.split("").forEach(function(letter, idx) { - var color = colors[idx], size = captchagen.getFontSize(opt.height, opt.width, opt.font), - te, y, rot; - - ctx.font = size + "px " + opt.font; - ctx.textBaseline = "top"; - te = ctx.measureText(letter); - y = 10; - - // set color - ctx.fillStyle = color.css; - - // set font rotation - rot = (Math.random() * -0.2) + 0.1; - ctx.rotate(rot); - - // draw text - ctx.fillText(letter, x, y); - - // unset rotation for next letter - ctx.rotate(-rot); - - // space the x-axis for the next letter - x += te.width + 1; - }); - return canvas; -}; - -module.exports = function(req) { - "use strict"; - - var chars = "2345679ACDEFGHJKLMNPQRTUVWXY", - text = "", - count, captcha; - - for (count = 0; count < 8; count++) { - text += chars.charAt(Math.floor(Math.random() * chars.length)); - } - - captcha = new captchagen.Captcha({ - width: 180, - height: 50, - text: text - }); - - captcha.use(captchagen.drawBackground); - captcha.use(captchagen.drawLines); - captcha.use(captchagen.drawText); - captcha.use(captchagen.drawLines); - - captcha.generate(); - - return captcha; -}; diff --git a/roncli.com/server/models/tweet.js b/roncli.com/server/models/tweet.js index cf667b5d..175994fa 100644 --- a/roncli.com/server/models/tweet.js +++ b/roncli.com/server/models/tweet.js @@ -50,9 +50,9 @@ module.exports.getTweets = function(callback) { html: (tweet.retweeted_status ? tweet.retweeted_status.text : tweet.text) .replace(/(.*?)((([hH][tT][tT][pP][sS]?|[fF][tT][pP]):\/\/)?([\w\.\-]+(:[\w\.&%\$\-]+)*@)?((([^\s\(\)<>\\"\.\[\],@;:]+)(\.[^\s\(\)<>\\"\.\[\],@;:]+)*(\.[a-zA-Z]{2,4}))|((([01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}([01]?\d{1,2}|2[0-4]\d|25[0-5])))(\b:(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]\d{4}|[1-9]\d{0,3}|0)\b)?((\/[^\/][\w\.,\?'\\\/\+&%\$#=~_\-@]*)*[^\.,\?"'\(\)\[\]!;<>{}\s\x7F-\xFF])?)(.*?)/g, "$1$2$20") .replace(/([<]a target="_blank" href=")((?!(https?:\/\/|ftp:\/\/))[^"]*)(")/g, "$1http://$2$4") - .replace(/^((?:[ ])*)(@([a-zA-Z0-9_]{1,20}))(.*?)/g, "$1$2$4") - .replace(/(.*?)(^|[^a-zA-Z0-9_>])(@([a-zA-Z0-9_]{1,20}))((?=(.|$)).*?)/g, "$1$2$3$5") - .replace(/(.*?)(^|[^a-zA-Z0-9&\/]+)(#|\uFF03)([a-zA-Z0-9_]*[a-zA-Z_]+#*)(.*?)/g, "$1$2$3$4$5") + .replace(/^((?:[ ])*)(@([a-zA-Z0-9_]{1,20}))(.*?)/g, "$1$2$4") + .replace(/(.*?)(^|[^a-zA-Z0-9_>])(@([a-zA-Z0-9_]{1,20}))((?=(.|$)).*?)/g, "$1$2$3$5") + .replace(/(.*?)(^|[^a-zA-Z0-9&\/]+)(#|\uFF03)([a-zA-Z0-9_]*[a-zA-Z_]+#*)(.*?)/g, "$1$2$3$4$5") }; }); diff --git a/roncli.com/server/rss/blog.js b/roncli.com/server/rss/blog.js index 811229a9..1709bfcc 100644 --- a/roncli.com/server/rss/blog.js +++ b/roncli.com/server/rss/blog.js @@ -29,9 +29,9 @@ module.exports.rss = function(req, res, callback) { feed.title = "roncli.com Blog"; feed.description = "The blog of roncli"; feed.generator = "roncli.com"; - feed.feed_url = "http://roncli.com/blog.rss"; - feed.site_url = "http://roncli.com/blog"; - feed.image_url = "http://roncli.com/images/roncliSmall.png"; + feed.feed_url = "https://roncli.com/blog.rss"; + feed.site_url = "https://roncli.com/blog"; + feed.image_url = "https://roncli.com/images/roncliSmall.png"; feed.managingEditor = "roncli@roncli.com (Ronald M. Clifford)"; feed.webMaster = "roncli@roncli.com (Ronald M. Clifford)"; feed.copyright = (new Date()).getFullYear().toString() + " Ronald M. Clifford"; @@ -67,7 +67,7 @@ module.exports.rss = function(req, res, callback) { var deferred = new Deferred(); cache.zcard(key, function(count) { - var base = "http://roncli.com/blog.rss", + var base = "https://roncli.com/blog.rss", query = "?", lastStart = Math.floor((count - 1) / 25) * 25 + 1; @@ -155,7 +155,7 @@ module.exports.rss = function(req, res, callback) { categories: post.post.categories, title: post.post.blogTitle, description: content, - url: "http://roncli.com" + post.blogUrl, + url: "https://roncli.com" + post.blogUrl, author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(post.post.published)).format()} diff --git a/roncli.com/server/rss/coding.js b/roncli.com/server/rss/coding.js index e61e8678..081bb7d4 100644 --- a/roncli.com/server/rss/coding.js +++ b/roncli.com/server/rss/coding.js @@ -28,9 +28,9 @@ module.exports.rss = function(req, res, callback) { feed.title = "roncli.com Coding"; feed.description = "Commits and releases for roncli's projects."; feed.generator = "roncli.com"; - feed.feed_url = "http://roncli.com/coding.rss"; - feed.site_url = "http://roncli.com/coding"; - feed.image_url = "http://roncli.com/images/roncliSmall.png"; + feed.feed_url = "https://roncli.com/coding.rss"; + feed.site_url = "https://roncli.com/coding"; + feed.image_url = "https://roncli.com/images/roncliSmall.png"; feed.managingEditor = "roncli@roncli.com (Ronald M. Clifford)"; feed.webMaster = "roncli@roncli.com (Ronald M. Clifford)"; feed.copyright = (new Date()).getFullYear().toString() + " Ronald M. Clifford"; @@ -42,7 +42,7 @@ module.exports.rss = function(req, res, callback) { // Get the latest events. coding.getLatestEvents(0, function(err, events) { - var base = "http://roncli.com/coding.rss", + var base = "https://roncli.com/coding.rss", count, lastStart; if (err) { @@ -94,7 +94,7 @@ module.exports.rss = function(req, res, callback) { categories: [event.type], title: title, description: event.message, - url: "http://roncli.com/coding", + url: "https://roncli.com/coding", author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(event.published)).format()} diff --git a/roncli.com/server/rss/gaming.js b/roncli.com/server/rss/gaming.js index 9272a4af..7f780544 100644 --- a/roncli.com/server/rss/gaming.js +++ b/roncli.com/server/rss/gaming.js @@ -33,9 +33,9 @@ module.exports.rss = function(req, res, callback) { feed.title = "roncli Gaming"; feed.description = "The latest videos and gaming updates from roncli."; feed.generator = "roncli.com"; - feed.feed_url = "http://roncli.com/gaming.rss"; - feed.site_url = "http://roncli.com/gaming"; - feed.image_url = "http://roncli.com/images/roncliSmall.png"; + feed.feed_url = "https://roncli.com/gaming.rss"; + feed.site_url = "https://roncli.com/gaming"; + feed.image_url = "https://roncli.com/images/roncliSmall.png"; feed.managingEditor = "roncli@roncli.com (Ronald M. Clifford)"; feed.webMaster = "roncli@roncli.com (Ronald M. Clifford)"; feed.copyright = (new Date()).getFullYear().toString() + " Ronald M. Clifford"; @@ -99,7 +99,7 @@ module.exports.rss = function(req, res, callback) { categories: ["World of Warcraft Feed"], title: title, description: description, - url: "http://roncli.com/gaming", + url: "https://roncli.com/gaming", author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(item.timestamp)).format()} @@ -129,7 +129,7 @@ module.exports.rss = function(req, res, callback) { categories: ["Descent Champions Ladder Matches"], title: title, description: description, - url: "http://roncli.com/gaming", + url: "https://roncli.com/gaming", author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(match.date)).format()} @@ -154,7 +154,7 @@ module.exports.rss = function(req, res, callback) { categories: ["Six Gaming Podcast Highlights"], title: video.title, description: video.description, - url: "http://roncli.com/playlist/PLzcYb51h4me8-Jq9mOk6Vk1MLodmhRZ6K/six-gaming-podcast-highlights", + url: "https://roncli.com/playlist/PLzcYb51h4me8-Jq9mOk6Vk1MLodmhRZ6K/six-gaming-podcast-highlights", author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(video.publishedAt)).format()} @@ -181,7 +181,7 @@ module.exports.rss = function(req, res, callback) { categories: ["World of Warcraft Videos"], title: video.title, description: video.description, - url: "http://roncli.com/playlist/PLoqgd0t_KsN4SzIkVVyPVt7UuT3d6Rr7G/gaming-world-of-warcraft", + url: "https://roncli.com/playlist/PLoqgd0t_KsN4SzIkVVyPVt7UuT3d6Rr7G/gaming-world-of-warcraft", author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(video.publishedAt)).format()} @@ -208,7 +208,7 @@ module.exports.rss = function(req, res, callback) { categories: ["Diablo III Videos"], title: video.title, description: video.description, - url: "http://roncli.com/playlist/PLoqgd0t_KsN7LEYsVepkfbn2xOiC5M5yY/gaming-diablo-iii", + url: "https://roncli.com/playlist/PLoqgd0t_KsN7LEYsVepkfbn2xOiC5M5yY/gaming-diablo-iii", author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(video.publishedAt)).format()} @@ -235,7 +235,7 @@ module.exports.rss = function(req, res, callback) { categories: ["Descent Videos"], title: video.title, description: video.description, - url: "http://roncli.com/playlist/PLoqgd0t_KsN5hXZPYr9GjcGrDaj3Uq2A-/gaming-descent", + url: "https://roncli.com/playlist/PLoqgd0t_KsN5hXZPYr9GjcGrDaj3Uq2A-/gaming-descent", author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(video.publishedAt)).format()} @@ -270,7 +270,7 @@ module.exports.rss = function(req, res, callback) { rssDeferred.promise.then( function() { var count = feed.items.length, - base = "http://roncli.com/gaming.rss", + base = "https://roncli.com/gaming.rss", lastStart = Math.floor((count - 1) / 25) * 25 + 1; feed.custom_elements.push({"openSearch:totalResults": count}); diff --git a/roncli.com/server/rss/music.js b/roncli.com/server/rss/music.js index 7d3f18c6..05186731 100644 --- a/roncli.com/server/rss/music.js +++ b/roncli.com/server/rss/music.js @@ -29,9 +29,9 @@ module.exports.rss = function(req, res, callback) { feed.title = "The Home of The Nightstalker"; feed.description = "The music of roncli, The Nightstalker"; feed.generator = "roncli.com"; - feed.feed_url = "http://roncli.com/music.rss"; - feed.site_url = "http://roncli.com/music"; - feed.image_url = "http://roncli.com/images/roncliSmall.png"; + feed.feed_url = "https://roncli.com/music.rss"; + feed.site_url = "https://roncli.com/music"; + feed.image_url = "https://roncli.com/images/roncliSmall.png"; feed.managingEditor = "roncli@roncli.com (Ronald M. Clifford)"; feed.webMaster = "roncli@roncli.com (Ronald M. Clifford)"; feed.copyright = (new Date()).getFullYear().toString() + " Ronald M. Clifford"; @@ -67,7 +67,7 @@ module.exports.rss = function(req, res, callback) { var deferred = new Deferred(); cache.zcard(key, function(count) { - var base = "http://roncli.com/music.rss", + var base = "https://roncli.com/music.rss", query = "?", lastStart = Math.floor((count - 1) / 25) * 25 + 1; @@ -134,7 +134,7 @@ module.exports.rss = function(req, res, callback) { categories: [].concat.apply([], [[song.genre], song.tag_list.length === 0 ? [] : song.tag_list.replace(/"[^"]+"|( )/g, function(match, group) {return group ? "||" : match;}).replace(/"/g, "").split("||")]), title: song.title, description: content, - url: "http://roncli.com" + song.songUrl, + url: "https://roncli.com" + song.songUrl, author: "roncli@roncli.com (roncli)", custom_elements: [ {"atom:updated": moment(new Date(song.published)).format()} diff --git a/roncli.com/server/steam/steam.js b/roncli.com/server/steam/steam.js index 77664837..e846ae2f 100644 --- a/roncli.com/server/steam/steam.js +++ b/roncli.com/server/steam/steam.js @@ -20,7 +20,7 @@ var config = require("../privateConfig").steam, games.forEach(function(game) { if (game.appId !== 2430 && game.playtimeForever > 0) { - game.header = "http://cdn.akamai.steamstatic.com/steam/apps/" + game.appId + "/header.jpg"; + game.header = "https://steamcdn-a.akamaihd.net/steam/apps/" + game.appId + "/header.jpg"; gamesToAdd.push(game); gameInfo.push({ key: game.appId, diff --git a/roncli.com/server/templates/email/changeEmail/html.hbs b/roncli.com/server/templates/email/changeEmail/html.hbs index 8a2a3920..f986cfd6 100644 --- a/roncli.com/server/templates/email/changeEmail/html.hbs +++ b/roncli.com/server/templates/email/changeEmail/html.hbs @@ -4,7 +4,7 @@ {{alias}},

Someone requested an email address change for this email address.

    -
  • If you did not make this request, simply delete this email. Your account is as secure as your email account, as this is the only link that exists to change your account's email address. If you feel your email account may have been compromised, you should visit roncli.com/account to change your password now.

    • +
  • If you did not make this request, simply delete this email. Your account is as secure as your email account, as this is the only link that exists to change your account's email address. If you feel your email account may have been compromised, you should visit roncli.com/account to change your password now.

  • If you wish to change your account's email address, please visit the link below to change your email address.
@@ -16,7 +16,7 @@