Many fixes, began user feed generator

32 files changed, 53 insertions, 253 deletions

diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
index d54cbe6..484102d 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
@@ -250,11 +250,13 @@ function InitializeChatServer() {
         ChatTextInput.keyup(function (e) {
             if (ChatSocket.readyState === 1) {
                 if (e.keyCode === 13 && ChatTextInput.val().length > 0) {
+                    const ChatTextInputText = ChatTextInput.val();
+                    ChatTextInput.val("");
                     var LastMessage = $(".MessageWrapper.Normal:last .ChatMessage");
                     if (!LastMessage.hasClass("MessageSent")) { // CHECK IF PREVIOUS MESSAGE WAS FROM HIMSELF TOO -> IF NOT, CREATE NEW 'ALONE' MESSAGE
-                        ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageSent AloneMessage animated fadeInRight'>" + ChatTextInput.val() + "</div></div>");
+                        ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageSent AloneMessage animated fadeInRight'>" + ChatTextInputText + "</div></div>");
                     } else if (LastMessage.hasClass("MessageSent")) { // IF PREVIOUS MESSAGE WAS FROM HIMSELF TOO -> CREATE WITH CORRESPONDING CLASSES FOR DESIGN
-                        ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageSent BottomMessage animated fadeInRight'>" + ChatTextInput.val() + "</div></div>");
+                        ChatMessages.append("<div class='MessageWrapper Normal'><div class='ChatMessage MessageSent BottomMessage animated fadeInRight'>" + ChatTextInputText + "</div></div>");
                         if (LastMessage.hasClass("AloneMessage")) {
                             LastMessage.removeClass("AloneMessage");
                             LastMessage.addClass("TopMessage");
@@ -271,7 +273,7 @@ function InitializeChatServer() {
 
                     // ENCRYPT AND SEND MESSAGE WITH OWN PUBLIC KEY
                     options = {
-                        data: ChatTextInput.val(),
+                        data: ChatTextInputText,
                         publicKeys: openpgp.key.readArmored(PublicKey[current_username]).keys,
                         privateKeys: [privKeyObj] // FOR SIGNING
                     };
@@ -284,13 +286,11 @@ function InitializeChatServer() {
                             EncryptedWithKeyOfUsername: current_username,
                             Message: EncryptedMessage
                         }));
-                        ChatTextInput.val("");
-                        ChatTextInput.val("");
                     });
 
                     // ENCRYPT AND SEND MESSAGE WITH RECEIVERS PUBLIC KEY
                     options = {
-                        data: ChatTextInput.val(),
+                        data: ChatTextInputText,
                         publicKeys: openpgp.key.readArmored(PublicKey[ReceiversUsername]).keys,
                         privateKeys: [privKeyObj] // FOR SIGNING
                     };
@@ -303,8 +303,6 @@ function InitializeChatServer() {
                             EncryptedWithKeyOfUsername: ReceiversUsername,
                             Message: EncryptedMessage
                         }));
-                        ChatTextInput.val("");
-                        ChatTextInput.val("");
                     });
                 }
             } else {
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/imageCaching.js b/main/app/sprinkles/core/assets/SiteAssets/js/imageCaching.js
deleted file mode 100644
index ee11c70..0000000
--- a/main/app/sprinkles/core/assets/SiteAssets/js/imageCaching.js
+++ /dev/null
@@ -1,132 +0,0 @@
-;(function ($) {
-    function jQueryImageCaching(params) {
-        var ImageCaching = {
-            selector: 'img',
-            debugMode: false,
-            cachingKeyAttribute: 'data-caching-key',
-            sourceKeyAttribute: 'data-src',
-            renderCallback: null,
-            crossOrigin: 'Anonymous',
-            init: function (params) {
-                ImageCaching.log('Initialization of ImageCaching');
-                for (var param in params) {
-                    ImageCaching[param] = params[param];
-                    console.log("%c[CACHE LOGGER] Image caching initialized for " + params[param]['selector'] + "!", "color: brown;");
-                }
-
-                $(ImageCaching.selector).each(function () {
-                    ImageCaching.applyToImage($(this));
-                });
-            },
-            getCookie(cookie) {
-                var value = "; " + document.cookie;
-                var parts = value.split("; " + cookie + "=");
-                if (parts.length === 2) return parts.pop().split(";").shift();
-            },
-            getCacheKey: function (element) {
-                if (element.attr(ImageCaching.cachingKeyAttribute)) {
-                    return element.attr(ImageCaching.cachingKeyAttribute);
-                } else {
-                    return element.attr(ImageCaching.sourceKeyAttribute);
-                }
-            },
-            getCache: function (element) {
-                var key = this.getCacheKey(element);
-                return this.getCookie(key);
-            },
-            setCache: function (element, imageData) {
-                var key = ImageCaching.getCacheKey(element);
-                ImageCaching.log('Set cache', key, imageData, element);
-                document.cookie = key + "=" + encodeURIComponent(imageData) + "; expires=Mon, 18 Dec 2102 04:48:00 CEST; path=/"; // save image data
-                return true;
-            },
-            removeCache: function (element) {
-                var key = ImageCaching.getCacheKey(element);
-                ImageCaching.log('Remove cache', key);
-                document.cookie = key + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/"; // delete image data
-                return true;
-            },
-            renderImage: function (element, picture) {
-                ImageCaching.log('Rendering...', picture, element);
-                element.attr('src', picture);
-
-                if (this.renderCallback) {
-                    ImageCaching.log('Render Callback...', element);
-                    this.renderCallback(picture, element);
-                }
-            },
-            applyToImage: function (element, force) {
-                var cache = null;
-                if (!force) {
-                    cache = this.getCache(element);
-                }
-
-                if (cache) {
-                    ImageCaching.log('Image from cache', element);
-                    this.renderImage(element, cache);
-                } else {
-                    var sourceLink = element.attr(ImageCaching.sourceKeyAttribute);
-                    var getParamPrefix = "?";
-                    if (sourceLink.indexOf('?') > 0) {
-                        getParamPrefix = "&";
-                    }
-                    sourceLink += getParamPrefix + 'cacheTime=' + Date.now();
-
-                    ImageCaching.log('Request to: ' + sourceLink, element);
-
-                    var img = new Image();
-
-                    if (ImageCaching.crossOrigin) {
-                        img.setAttribute('crossOrigin', 'Anonymous');
-                    }
-
-                    img.onload = function () {
-                        ImageCaching.log('Loading completed', img);
-                        var canvas = document.createElement('canvas');
-                        canvas.width = img.width;
-                        canvas.height = img.height;
-
-                        // Copy the image contents to the canvas
-                        var ctx = canvas.getContext("2d");
-                        ctx.drawImage(img, 0, 0);
-
-                        var imageData = canvas.toDataURL("image/png");
-                        ImageCaching.setCache(element, imageData);
-                        ImageCaching.renderImage(element, imageData);
-                    };
-                    img.src = sourceLink;
-                }
-            },
-            refresh: function (itemsSelector) {
-                var selector = null;
-                if (itemsSelector) {
-                    selector = itemsSelector;
-                } else {
-                    selector = ImageCaching.selector;
-                }
-
-                $(selector).each(function () {
-                    ImageCaching.applyToImage($(this), true);
-                });
-
-            },
-            log: function () {
-                if (this.debugMode) {
-                    console.log(arguments);
-                }
-            }
-
-        };
-        ImageCaching.init(params);
-        return ImageCaching;
-    }
-
-    $.fn.extend({
-        imageCaching: function (options) {
-            var params = {selector: this};
-            params = $.extend(params, options);
-
-            return new jQueryImageCaching(params);
-        }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
index 33716b5..0a991fc 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
@@ -38,62 +38,6 @@ function triggerErrorPopup(ErrorCode) {
 }
 
 /**
- * ENCRYPTION
- */
-/*var openpgp = window.openpgp;
-var options, EncryptedText, DecryptedText, PrivateKey, PassPhrase, PrivateKeyObj;
-var PublicKey = [];
-openpgp.initWorker({path: '/assets-raw/core/assets/SiteAssets/js/openpgp.worker.js'});
-
-$.ajax({
-    type: 'GET',
-    url: site.uri.public + '/api/users/u/' + current_username + '/publickey',
-    dataType : "json",
-    success: function (response) {
-        if (response.user_id === current_user_id) {
-            PublicKey[current_username] = response.PublicKey;
-            PrivateKey = localStorage.getItem("PrivateKey");
-            PassPhrase = localStorage.getItem("🔒")
-        }
-    }
-});
-
-function EncryptMessage(Message, Username) {
-    if (!Username in PublicKey) {
-        $.ajax({
-            type: 'GET',
-            url: site.uri.public + '/api/users/u/' + Username + '/publickey',
-            dataType : "json",
-            success: function (response) {
-                if (response.user_id === current_user_id) {
-                    PublicKey[Username] = response.PublicKey;
-                }
-            }
-        });
-    }
-    options = {
-        data: Message,
-        publicKeys: openpgp.key.readArmored(PublicKey[Username]).keys
-    };
-    openpgp.encrypt(options).then(function (EncryptedText) {
-        EncryptedText = EncryptedText.data;
-    });
-}
-
-function DecryptMessage(EncryptedText) {
-    PrivateKeyObj = openpgp.key.readArmored(PrivateKey).keys[0];
-    PrivateKeyObj.decrypt(PassPhrase);
-    options = {
-        message: openpgp.message.readArmored(EncryptedText),
-        privateKeys: [PrivateKeyObj]
-    };
-
-    openpgp.decrypt(options).then(function (DecryptedText) {
-        DecryptedText = DecryptedText.data;
-    });
-}*/
-
-/**
  * OLD BROWSER
  * @type {boolean}
  */
@@ -150,10 +94,6 @@ MainTabWindows.on('beforeChange', function (event, slick, currentSlide, nextSlid
 
     currentSlide.children().attr("src", (currentSlide.children().attr("src").split('.svg')[0].replace('Activated', '') + ".svg"));
     nextSlide.children().attr("src", nextSlide.children().attr("src").split('.svg')[0] + "Activated.svg");
-    //currentSlide.children().attr("data-src", (currentSlide.children().attr("data-src").split('.svg')[0].replace('Activated', '') + ".svg"));
-    //nextSlide.children().attr("data-caching-key", nextSlide.children().attr("data-src").split('.svg')[0].split('/').pop() + "Activated_nav_cached");
-    //nextSlide.children().attr("data-src", nextSlide.children().attr("data-src").split('.svg')[0] + "Activated.svg");
-    //cachedNavbarIcons.refresh();
     $el = nextSlide;
     $el.addClass("ActiveTab");
     leftPos = $el.position().left;
@@ -179,10 +119,7 @@ UserSearchBar.keyup(function () {
                 //var RandomGifUrl = GifUrls[RandomGif];
                 //console.image(RandomGifUrl, 0.5);
 
-                alerts.ufAlerts().ufAlerts('fetch');
-
                 SearchResults.append("<img class='Avatar' src='" + answer.avatar + "'/><div class='UsersFullName'>" + answer.full_name + "</div>");
-                //$(".SearchResults .Avatar").imageCaching(); // refresh
             },
             error: function () {
                 console.log("%c[SEARCH LOGGER] User " + RequestedUser + " was not found!", "color: red");
@@ -206,7 +143,7 @@ $(document).ready(function () {
             })
         },
         error: function () {
-            console.log("%c[SEARCH LOGGER] User " + RequestedUser + " was not found!", "color: red");
+            console.log("%c[FRIENDLY LOGGER] No friends were found! :(", "color: red");
 
             alerts.ufAlerts().ufAlerts('fetch');
         }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/popups.js b/main/app/sprinkles/core/assets/SiteAssets/js/popups.js
index 00851d6..7980509 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/popups.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/popups.js
@@ -1625,7 +1625,7 @@
         return new Promise(function (resolve, reject) {
             // functions to handle all resolving/rejecting/settling
             var succeedWith = function succeedWith(value) {
-                constructor.closePopup(innerParams.onClose, innerParams.onAfterClose); // TODO: make closePopup an *instance* method
+                constructor.closePopup(innerParams.onClose, innerParams.onAfterClose); // O: make closePopup an *instance* method
                 if (innerParams.useRejections) {
                     resolve(value);
                 } else {
@@ -1682,7 +1682,7 @@
 
             var confirm = function confirm(value) {
                 if (innerParams.showLoaderOnConfirm) {
-                    constructor.showLoading(); // TODO: make showLoading an *instance* method
+                    constructor.showLoading(); // make showLoading an *instance* method
                 }
 
                 if (innerParams.preConfirm) {
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/src/Ratchet/AbstractConnectionDecorator.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/src/Ratchet/AbstractConnectionDecorator.php
index ddb7c7b..df7580d 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/src/Ratchet/AbstractConnectionDecorator.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/src/Ratchet/AbstractConnectionDecorator.php
@@ -5,7 +5,7 @@ namespace Ratchet;
 /**
  * Wraps ConnectionInterface objects via the decorator pattern but allows
  * parameters to bubble through with magic methods
- * @todo It sure would be nice if I could make most of this a trait...
+ *  It sure would be nice if I could make most of this a trait...
  */
 abstract class AbstractConnectionDecorator implements ConnectionInterface
 {
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/src/Ratchet/WebSocket/WsServerInterface.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/src/Ratchet/WebSocket/WsServerInterface.php
index f83b273..2f42a11 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/src/Ratchet/WebSocket/WsServerInterface.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/src/Ratchet/WebSocket/WsServerInterface.php
@@ -10,7 +10,7 @@ interface WsServerInterface
     /**
      * If any component in a stack supports a WebSocket sub-protocol return each supported in an array
      * @return array
-     * @todo This method may be removed in future version (note that will not break code, just make some code obsolete)
+     * @odo This method may be removed in future version (note that will not break code, just make some code obsolete)
      */
     function getSubProtocols();
 }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/tests/unit/Wamp/WampServerTest.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/tests/unit/Wamp/WampServerTest.php
index 0f427fe..7f877ff 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/tests/unit/Wamp/WampServerTest.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/cboden/ratchet/tests/unit/Wamp/WampServerTest.php
@@ -36,7 +36,6 @@ class WampServerTest extends AbstractMessageComponentTestCase
     }
 
     public function testGetSubProtocols() {
-        // todo: could expand on this
         $this->assertInternalType('array', $this->_serv->getSubProtocols());
     }
 
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/guzzlehttp/psr7/src/BufferStream.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/guzzlehttp/psr7/src/BufferStream.php
index ab21e27..2a73f25 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/guzzlehttp/psr7/src/BufferStream.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/guzzlehttp/psr7/src/BufferStream.php
@@ -104,7 +104,7 @@ class BufferStream implements StreamInterface
     public function write($string) {
         $this->buffer .= $string;
 
-        // TODO: What should happen here?
+        // What should happen here?
         if (strlen($this->buffer) >= $this->hwm) {
             return FALSE;
         }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php
index 680a16c..45cdc32 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php
@@ -19,7 +19,7 @@ use Assetic\Filter\FilterInterface;
  * Applies a filter to an asset based on a source and/or target path match.
  *
  * @author Kris Wallsmith <kris.wallsmith@gmail.com>
- * @todo A better asset-matcher mechanism
+ *  A better asset-matcher mechanism
  */
 class EnsureFilterWorker implements WorkerInterface
 {
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php
index 40e3941..ffc7e9e 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php
@@ -290,14 +290,13 @@ class CompassFilter extends BaseSassFilter
         if (NULL !== $this->scss) {
             $type = $this->scss ? 'scss' : 'sass';
         } else if ($path = $asset->getSourcePath()) {
-            // FIXME: what if the extension is something else?
             $type = pathinfo($path, PATHINFO_EXTENSION);
         } else {
             $type = 'scss';
         }
 
         $tempName = tempnam($tempDir, 'assetic_compass');
-        unlink($tempName); // FIXME: don't use tempnam() here
+        unlink($tempName);
 
         // input
         $input = $tempName . '.' . $type;
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssEmbedFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssEmbedFilter.php
index da9a61a..d537dee 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssEmbedFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssEmbedFilter.php
@@ -126,7 +126,7 @@ class CssEmbedFilter extends BaseProcessFilter implements DependencyExtractorInt
     }
 
     public function getChildren(AssetFactory $factory, $content, $loadPath = NULL) {
-        // todo
+        
         return array();
     }
 }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssImportFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssImportFilter.php
index 3939bfe..dc4797c 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssImportFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssImportFilter.php
@@ -98,7 +98,7 @@ class CssImportFilter extends BaseCssFilter implements DependencyExtractorInterf
     }
 
     public function getChildren(AssetFactory $factory, $content, $loadPath = NULL) {
-        // todo
+        
         return array();
     }
 }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessFilter.php
index 4532cdd..3f5a817 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessFilter.php
@@ -153,8 +153,8 @@ EOF;
     }
 
     /**
-     * @todo support for import-once
-     * @todo support for import (less) "lib.css"
+     *  support for import-once
+     *  support for import (less) "lib.css"
      */
     public function getChildren(AssetFactory $factory, $content, $loadPath = NULL) {
         $loadPaths = $this->loadPaths;
@@ -170,7 +170,7 @@ EOF;
         foreach (LessUtils::extractImports($content) as $reference) {
             if ('.css' === substr($reference, -4)) {
                 // skip normal css imports
-                // todo: skip imports with media queries
+                // skip imports with media queries
                 continue;
             }
 
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessphpFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessphpFilter.php
index 5424655..181db96 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessphpFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessphpFilter.php
@@ -130,7 +130,7 @@ class LessphpFilter implements DependencyExtractorInterface
         foreach (LessUtils::extractImports($content) as $reference) {
             if ('.css' === substr($reference, -4)) {
                 // skip normal css imports
-                // todo: skip imports with media queries
+                // skip imports with media queries
                 continue;
             }
 
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/PhpCssEmbedFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/PhpCssEmbedFilter.php
index dd41eb6..1c1d667 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/PhpCssEmbedFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/PhpCssEmbedFilter.php
@@ -42,7 +42,7 @@ class PhpCssEmbedFilter implements DependencyExtractorInterface
     }
 
     public function getChildren(AssetFactory $factory, $content, $loadPath = NULL) {
-        // todo
+        
         return array();
     }
 }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/RooleFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/RooleFilter.php
index f841d6f..b5cc5af 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/RooleFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/RooleFilter.php
@@ -74,7 +74,7 @@ class RooleFilter extends BaseNodeFilter implements DependencyExtractorInterface
     }
 
     public function getChildren(AssetFactory $factory, $content, $loadPath = NULL) {
-        // todo
+        
         return array();
     }
 }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/BaseSassFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/BaseSassFilter.php
index 7d1e7fb..714a112 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/BaseSassFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/BaseSassFilter.php
@@ -34,7 +34,7 @@ abstract class BaseSassFilter extends BaseProcessFilter implements DependencyExt
         foreach (SassUtils::extractImports($content) as $reference) {
             if ('.css' === substr($reference, -4)) {
                 // skip normal css imports
-                // todo: skip imports with media queries
+                // skip imports with media queries
                 continue;
             }
 
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/SprocketsFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/SprocketsFilter.php
index b1d8610..69a83cf 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/SprocketsFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/SprocketsFilter.php
@@ -120,7 +120,7 @@ EOF;
     }
 
     public function getChildren(AssetFactory $factory, $content, $loadPath = NULL) {
-        // todo
+        
         return array();
     }
 
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/StylusFilter.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/StylusFilter.php
index bca2206..b7a44fa 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/StylusFilter.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/kriswallsmith/assetic/src/Assetic/Filter/StylusFilter.php
@@ -114,7 +114,7 @@ EOF;
     }
 
     public function getChildren(AssetFactory $factory, $content, $loadPath = NULL) {
-        // todo
+        
         return array();
     }
 }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/NegotiatorInterface.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/NegotiatorInterface.php
index 0f0b58e..b80769a 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/NegotiatorInterface.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/NegotiatorInterface.php
@@ -6,7 +6,7 @@ use Psr\Http\Message\RequestInterface;
 
 /**
  * A standard interface for interacting with the various version of the WebSocket protocol
- * @todo Look in to extension support
+ *  Look in to extension support
  */
 interface NegotiatorInterface
 {
@@ -42,7 +42,7 @@ interface NegotiatorInterface
      * If enabled and support for a subprotocol has been added handshake
      *  will not upgrade if a match between request and supported subprotocols
      * @param boolean $enable
-     * @todo Consider extending this interface and moving this there.
+     *  Consider extending this interface and moving this there.
      *       The spec does says the server can fail for this reason, but
      *       it is not a requirement. This is an implementation detail.
      */
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/RequestVerifier.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/RequestVerifier.php
index 7a8660a..59b9bcc 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/RequestVerifier.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/RequestVerifier.php
@@ -7,7 +7,7 @@ use Psr\Http\Message\RequestInterface;
 /**
  * These are checks to ensure the client requested handshake are valid
  * Verification rules come from section 4.2.1 of the RFC6455 document
- * @todo Currently just returning invalid - should consider returning appropriate HTTP status code error #s
+ *  Currently just returning invalid - should consider returning appropriate HTTP status code error #s
  */
 class RequestVerifier
 {
@@ -74,7 +74,7 @@ class RequestVerifier
     /**
      * @param array $hostHeader
      * @return bool
-     * @todo Once I fix HTTP::getHeaders just verify this isn't NULL or empty...or maybe need to verify it's a valid domain??? Or should it equal $_SERVER['HOST'] ?
+     *  Once I fix HTTP::getHeaders just verify this isn't NULL or empty...or maybe need to verify it's a valid domain??? Or should it equal $_SERVER['HOST'] ?
      */
     public function verifyHost(array $hostHeader) {
         return (1 === count($hostHeader));
@@ -113,8 +113,8 @@ class RequestVerifier
      * This function verifies the nonce is valid (64 big encoded, 16 bytes random string)
      * @param array $keyHeader
      * @return bool
-     * @todo The spec says we don't need to base64_decode - can I just check if the length is 24 and not decode?
-     * @todo Check the spec to see what the encoding of the key could be
+     *  The spec says we don't need to base64_decode - can I just check if the length is 24 and not decode?
+     *  Check the spec to see what the encoding of the key could be
      */
     public function verifyKey(array $keyHeader) {
         return (1 === count($keyHeader) && 16 === strlen(base64_decode($keyHeader[0])));
@@ -130,13 +130,13 @@ class RequestVerifier
     }
 
     /**
-     * @todo Write logic for this method.  See section 4.2.1.8
+     *  Write logic for this method.  See section 4.2.1.8
      */
     public function verifyProtocol($val) {
     }
 
     /**
-     * @todo Write logic for this method.  See section 4.2.1.9
+     *  Write logic for this method.  See section 4.2.1.9
      */
     public function verifyExtensions($val) {
     }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/ServerNegotiator.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/ServerNegotiator.php
index 8ef854c..e8273a4 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/ServerNegotiator.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Handshake/ServerNegotiator.php
@@ -7,7 +7,7 @@ use GuzzleHttp\Psr7\Response;
 
 /**
  * The latest version of the WebSocket protocol
- * @todo Unicode: return mb_convert_encoding(pack("N",$u), mb_internal_encoding(), 'UCS-4BE');
+ *  Unicode: return mb_convert_encoding(pack("N",$u), mb_internal_encoding(), 'UCS-4BE');
  */
 class ServerNegotiator implements NegotiatorInterface
 {
@@ -129,7 +129,7 @@ class ServerNegotiator implements NegotiatorInterface
      * If enabled and support for a subprotocol has been added handshake
      *  will not upgrade if a match between request and supported subprotocols
      * @param boolean $enable
-     * @todo Consider extending this interface and moving this there.
+     *  Consider extending this interface and moving this there.
      *       The spec does says the server can fail for this reason, but
      * it is not a requirement. This is an implementation detail.
      */
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Messaging/Frame.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Messaging/Frame.php
index 62f5446..ac019c3 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Messaging/Frame.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/src/Messaging/Frame.php
@@ -313,7 +313,7 @@ class Frame implements FrameInterface
 
         return $payload ^ str_pad('', $len, $maskingKey, STR_PAD_RIGHT);
 
-        // TODO: Remove this before publish - keeping methods here to compare performance (above is faster but need control against v0.3.3)
+        // Remove this before publish - keeping methods here to compare performance (above is faster but need control against v0.3.3)
 
         $applied = '';
         for ($i = 0, $len = strlen($payload); $i < $len; $i++) {
@@ -424,7 +424,7 @@ class Frame implements FrameInterface
 
     /**
      * {@inheritdoc}
-     * @todo Consider not checking mask, always returning the payload, masked or not
+     *  Consider not checking mask, always returning the payload, masked or not
      */
     public function getPayload() {
         if (!$this->isCoalesced()) {
@@ -436,7 +436,7 @@ class Frame implements FrameInterface
 
     /**
      * Get the raw contents of the frame
-     * @todo This is untested, make sure the substr is right - trying to return the frame w/o the overflow
+     *  This is untested, make sure the substr is right - trying to return the frame w/o the overflow
      */
     public function getContents() {
         return substr($this->data, 0, $this->getPayloadStartingByte() + $this->getPayloadLength());
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/tests/unit/Messaging/FrameTest.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/tests/unit/Messaging/FrameTest.php
index 39edd11..59884b2 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/tests/unit/Messaging/FrameTest.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/ratchet/rfc6455/tests/unit/Messaging/FrameTest.php
@@ -6,8 +6,8 @@ use Ratchet\RFC6455\Messaging\Frame;
 
 /**
  * @covers Ratchet\RFC6455\Messaging\Frame
- * @todo getMaskingKey, getPayloadStartingByte don't have tests yet
- * @todo Could use some clean up in general, I had to rush to fix a bug for a deadline, sorry.
+ *  getMaskingKey, getPayloadStartingByte don't have tests yet
+ *  Could use some clean up in general, I had to rush to fix a bug for a deadline, sorry.
  */
 class FrameTest extends \PHPUnit_Framework_TestCase
 {
@@ -260,7 +260,7 @@ class FrameTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider UnframeMessageProvider
      * covers Ratchet\RFC6455\Messaging\Frame::getPayloadLength
-     * @todo Not yet testing when second additional payload length descriptor
+     *  Not yet testing when second additional payload length descriptor
      */
     public function testGetPayloadLengthFromFullMessage($msg, $encoded) {
         $this->_frame->addBuffer(base64_decode($encoded));
@@ -279,7 +279,7 @@ class FrameTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider maskingKeyProvider
      * covers Ratchet\RFC6455\Messaging\Frame::getMaskingKey
-     * @todo I I wrote the dataProvider incorrectly, skipping for now
+     *  I I wrote the dataProvider incorrectly, skipping for now
      */
     public function testGetMaskingKey($mask) {
         $this->_frame->addBuffer(static::encode($this->_firstByteFinText));
@@ -299,7 +299,7 @@ class FrameTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider UnframeMessageProvider
      * covers Ratchet\RFC6455\Messaging\Frame::getPayload
-     * @todo Move this test to bottom as it requires all methods of the class
+     *  Move this test to bottom as it requires all methods of the class
      */
     public function testUnframeFullMessage($unframed, $base_framed) {
         $this->_frame->addBuffer(base64_decode($base_framed));
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/react/promise/tests/FunctionResolveTest.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/react/promise/tests/FunctionResolveTest.php
index c82a370..7642c87 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/react/promise/tests/FunctionResolveTest.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/react/promise/tests/FunctionResolveTest.php
@@ -119,7 +119,7 @@ class FunctionResolveTest extends TestCase
     public function shouldSupportVeryDeepNestedPromises() {
         $deferreds = [];
 
-        // @TODO Increase count once global-queue is merged
+        //  Increase count once global-queue is merged
         for ($i = 0; $i < 10; $i++) {
             $deferreds[] = $d = new Deferred();
             $p = $d->promise();
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/react/socket/src/StreamEncryption.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/react/socket/src/StreamEncryption.php
index 8e2a250..17b9ec4 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/react/socket/src/StreamEncryption.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/react/socket/src/StreamEncryption.php
@@ -72,7 +72,7 @@ class StreamEncryption
         // pause actual stream instance to continue operation on raw stream socket
         $stream->pause();
 
-        // TODO: add write() event to make sure we're not sending any excessive data
+        // add write() event to make sure we're not sending any excessive data
 
         $deferred = new Deferred(function ($_, $reject) use ($toggle) {
             // cancelling this leaves this stream in an inconsistent state…
diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
index d2a1230..bc8a096 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/php/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/main/app/sprinkles/core/assets/SiteAssets/php/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -429,7 +429,7 @@ class PdoSessionHandler extends AbstractSessionHandler
      *
      * @return string
      *
-     * @todo implement missing support for oci DSN (which look totally different from other PDO ones)
+     *  implement missing support for oci DSN (which look totally different from other PDO ones)
      */
     private function buildDsnFromUrl($dsnOrUrl) {
         // (pdo_)?sqlite3?:///... => (pdo_)?sqlite3?://localhost/... or else the URL will be invalid
@@ -652,7 +652,7 @@ class PdoSessionHandler extends AbstractSessionHandler
      *
      * @throws \DomainException When an unsupported PDO driver is used
      *
-     * @todo implement missing advisory locks
+     *  implement missing advisory locks
      *       - for oci using DBMS_LOCK.REQUEST
      *       - for sqlsrv using sp_getapplock with LockOwner = Session
      */
diff --git a/main/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css b/main/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css
index 38fe523..dfe6b4b 100644
--- a/main/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css
+++ b/main/app/sprinkles/core/assets/userfrosting/css/AdminLTE.css
@@ -2233,7 +2233,7 @@ a:focus {
     font-size: 12px;
 }
 
-/* Widget: TODO LIST */
+/* Widget:*/
 .todo-list {
     margin: 0;
     padding: 0;
diff --git a/main/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js b/main/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js
index 8f31ca5..0bdfc9d 100644
--- a/main/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js
+++ b/main/app/sprinkles/core/assets/userfrosting/js/AdminLTE.js
@@ -709,12 +709,11 @@ function _init() {
 })(jQuery);
 
 /*
- * TODO LIST CUSTOM PLUGIN
+  LIST CUSTOM PLUGIN
  * -----------------------
  * This plugin depends on iCheck plugin for checkbox and radio inputs
  *
  * @type plugin
- * @usage $("#todo-widget").todolist( options );
  */
 (function ($) {
 
diff --git a/main/app/sprinkles/core/assets/userfrosting/js/uf-form.js b/main/app/sprinkles/core/assets/userfrosting/js/uf-form.js
index 3724ef7..06fcc43 100644
--- a/main/app/sprinkles/core/assets/userfrosting/js/uf-form.js
+++ b/main/app/sprinkles/core/assets/userfrosting/js/uf-form.js
@@ -29,7 +29,7 @@
  * UserFrosting https://www.userfrosting.com
  * @author Alexander Weissman <https://alexanderweissman.com>
  *
- * @todo Implement proper fallback for when `set` function isn't supported by FormData.
+ *  Implement proper fallback for when `set` function isn't supported by FormData.
  */
 ;(function ($, window, document, undefined) {
     'use strict';
@@ -166,7 +166,7 @@
                         console.log('Error (' + jqXHR.status + '): ' + jqXHR.responseText);
                     }
                     // Display errors on failure
-                    // TODO: ufAlerts widget should have a 'destroy' method
+                    // ufAlerts widget should have a 'destroy' method
                     if (!this.settings.msgTarget.data('ufAlerts')) {
                         this.settings.msgTarget.ufAlerts();
                     } else {
diff --git a/main/app/sprinkles/core/assets/userfrosting/js/uf-modal.js b/main/app/sprinkles/core/assets/userfrosting/js/uf-modal.js
index 588c40b..221a2fc 100644
--- a/main/app/sprinkles/core/assets/userfrosting/js/uf-modal.js
+++ b/main/app/sprinkles/core/assets/userfrosting/js/uf-modal.js
@@ -82,7 +82,7 @@
                             console.log("Error (" + data.status + "): " + data.responseText);
                         }
                         // Display errors on failure
-                        // TODO: ufAlerts widget should have a 'destroy' method
+                        // ufAlerts widget should have a 'destroy' method
                         if (!base.options.msgTarget.data('ufAlerts')) {
                             base.options.msgTarget.ufAlerts();
                         } else {
diff --git a/main/app/sprinkles/core/assets/userfrosting/js/uf-table.js b/main/app/sprinkles/core/assets/userfrosting/js/uf-table.js
index 692dccc..8981bb3 100644
--- a/main/app/sprinkles/core/assets/userfrosting/js/uf-table.js
+++ b/main/app/sprinkles/core/assets/userfrosting/js/uf-table.js
@@ -551,7 +551,7 @@
                     console.log('Error (' + jqXHR.status + '): ' + jqXHR.responseText);
                 }
                 // Display errors on failure
-                // TODO: ufAlerts widget should have a 'destroy' method
+                // ufAlerts widget should have a 'destroy' method
                 if (!this.settings.msgTarget.data('ufAlerts')) {
                     this.settings.msgTarget.ufAlerts();
                 } else {