1 files changed, 163 insertions, 138 deletions

diff --git a/deluge/ui/web/js/deluge-all/Formatters.js b/deluge/ui/web/js/deluge-all/Formatters.js
index 443bfdf56..6b09abee5 100644
--- a/deluge/ui/web/js/deluge-all/Formatters.js
+++ b/deluge/ui/web/js/deluge-all/Formatters.js
@@ -15,7 +15,23 @@
  * @version 1.3
  * @singleton
  */
-Deluge.Formatters = {
+Deluge.Formatters = (function () {
+    var charToEntity = {
+        '&': '&',
+        '>': '>',
+        '<': '&lt;',
+        '"': '&quot;',
+        "'": '&#39;',
+    };
+
+    var charToEntityRegex = new RegExp(
+        '(' + Object.keys(charToEntity).join('|') + ')',
+        'g'
+    );
+    var htmlEncodeReplaceFn = function (match, capture) {
+        return charToEntity[capture];
+    };
+
     /**
      * Formats a date string in the date representation of the current locale,
      * based on the systems timezone.
@@ -24,154 +40,162 @@ Deluge.Formatters = {
      * @return {String} a string in the date representation of the current locale
      * or "" if seconds < 0.
      */
-    date: function (timestamp) {
-        function zeroPad(num, count) {
-            var numZeropad = num + '';
-            while (numZeropad.length < count) {
-                numZeropad = '0' + numZeropad;
+    return (Formatters = {
+        date: function (timestamp) {
+            function zeroPad(num, count) {
+                var numZeropad = num + '';
+                while (numZeropad.length < count) {
+                    numZeropad = '0' + numZeropad;
+                }
+                return numZeropad;
+            }
+            timestamp = timestamp * 1000;
+            var date = new Date(timestamp);
+            return String.format(
+                '{0}/{1}/{2} {3}:{4}:{5}',
+                zeroPad(date.getDate(), 2),
+                zeroPad(date.getMonth() + 1, 2),
+                date.getFullYear(),
+                zeroPad(date.getHours(), 2),
+                zeroPad(date.getMinutes(), 2),
+                zeroPad(date.getSeconds(), 2)
+            );
+        },
+
+        /**
+         * Formats the bytes value into a string with KiB, MiB or GiB units.
+         *
+         * @param {Number} bytes the filesize in bytes
+         * @param {Boolean} showZero pass in true to displays 0 values
+         * @return {String} formatted string with KiB, MiB or GiB units.
+         */
+        size: function (bytes, showZero) {
+            if (!bytes && !showZero) return '';
+            bytes = bytes / 1024.0;
+
+            if (bytes < 1024) {
+                return bytes.toFixed(1) + ' KiB';
+            } else {
+                bytes = bytes / 1024;
             }
-            return numZeropad;
-        }
-        timestamp = timestamp * 1000;
-        var date = new Date(timestamp);
-        return String.format(
-            '{0}/{1}/{2} {3}:{4}:{5}',
-            zeroPad(date.getDate(), 2),
-            zeroPad(date.getMonth() + 1, 2),
-            date.getFullYear(),
-            zeroPad(date.getHours(), 2),
-            zeroPad(date.getMinutes(), 2),
-            zeroPad(date.getSeconds(), 2)
-        );
-    },
-
-    /**
-     * Formats the bytes value into a string with KiB, MiB or GiB units.
-     *
-     * @param {Number} bytes the filesize in bytes
-     * @param {Boolean} showZero pass in true to displays 0 values
-     * @return {String} formatted string with KiB, MiB or GiB units.
-     */
-    size: function (bytes, showZero) {
-        if (!bytes && !showZero) return '';
-        bytes = bytes / 1024.0;
-
-        if (bytes < 1024) {
-            return bytes.toFixed(1) + ' KiB';
-        } else {
-            bytes = bytes / 1024;
-        }
-
-        if (bytes < 1024) {
-            return bytes.toFixed(1) + ' MiB';
-        } else {
-            bytes = bytes / 1024;
-        }
-
-        return bytes.toFixed(1) + ' GiB';
-    },
-
-    /**
-     * Formats the bytes value into a string with K, M or G units.
-     *
-     * @param {Number} bytes the filesize in bytes
-     * @param {Boolean} showZero pass in true to displays 0 values
-     * @return {String} formatted string with K, M or G units.
-     */
-    sizeShort: function (bytes, showZero) {
-        if (!bytes && !showZero) return '';
-        bytes = bytes / 1024.0;
 
-        if (bytes < 1024) {
-            return bytes.toFixed(1) + ' K';
-        } else {
-            bytes = bytes / 1024;
-        }
+            if (bytes < 1024) {
+                return bytes.toFixed(1) + ' MiB';
+            } else {
+                bytes = bytes / 1024;
+            }
 
-        if (bytes < 1024) {
-            return bytes.toFixed(1) + ' M';
-        } else {
-            bytes = bytes / 1024;
-        }
+            return bytes.toFixed(1) + ' GiB';
+        },
+
+        /**
+         * Formats the bytes value into a string with K, M or G units.
+         *
+         * @param {Number} bytes the filesize in bytes
+         * @param {Boolean} showZero pass in true to displays 0 values
+         * @return {String} formatted string with K, M or G units.
+         */
+        sizeShort: function (bytes, showZero) {
+            if (!bytes && !showZero) return '';
+            bytes = bytes / 1024.0;
+
+            if (bytes < 1024) {
+                return bytes.toFixed(1) + ' K';
+            } else {
+                bytes = bytes / 1024;
+            }
 
-        return bytes.toFixed(1) + ' G';
-    },
+            if (bytes < 1024) {
+                return bytes.toFixed(1) + ' M';
+            } else {
+                bytes = bytes / 1024;
+            }
 
-    /**
-     * Formats a string to display a transfer speed utilizing {@link #size}
-     *
-     * @param {Number} bytes the number of bytes per second
-     * @param {Boolean} showZero pass in true to displays 0 values
-     * @return {String} formatted string with KiB, MiB or GiB units.
-     */
-    speed: function (bytes, showZero) {
-        return !bytes && !showZero ? '' : fsize(bytes, showZero) + '/s';
-    },
+            return bytes.toFixed(1) + ' G';
+        },
+
+        /**
+         * Formats a string to display a transfer speed utilizing {@link #size}
+         *
+         * @param {Number} bytes the number of bytes per second
+         * @param {Boolean} showZero pass in true to displays 0 values
+         * @return {String} formatted string with KiB, MiB or GiB units.
+         */
+        speed: function (bytes, showZero) {
+            return !bytes && !showZero ? '' : fsize(bytes, showZero) + '/s';
+        },
+
+        /**
+         * Formats a string to show time in a human readable form.
+         *
+         * @param {Number} time the number of seconds
+         * @return {String} a formatted time string. will return '' if seconds == 0
+         */
+        timeRemaining: function (time) {
+            if (time <= 0) {
+                return '&infin;';
+            }
+            time = time.toFixed(0);
+            if (time < 60) {
+                return time + 's';
+            } else {
+                time = time / 60;
+            }
 
-    /**
-     * Formats a string to show time in a human readable form.
-     *
-     * @param {Number} time the number of seconds
-     * @return {String} a formatted time string. will return '' if seconds == 0
-     */
-    timeRemaining: function (time) {
-        if (time <= 0) {
-            return '&infin;';
-        }
-        time = time.toFixed(0);
-        if (time < 60) {
-            return time + 's';
-        } else {
-            time = time / 60;
-        }
-
-        if (time < 60) {
-            var minutes = Math.floor(time);
-            var seconds = Math.round(60 * (time - minutes));
-            if (seconds > 0) {
-                return minutes + 'm ' + seconds + 's';
+            if (time < 60) {
+                var minutes = Math.floor(time);
+                var seconds = Math.round(60 * (time - minutes));
+                if (seconds > 0) {
+                    return minutes + 'm ' + seconds + 's';
+                } else {
+                    return minutes + 'm';
+                }
             } else {
-                return minutes + 'm';
+                time = time / 60;
             }
-        } else {
-            time = time / 60;
-        }
-
-        if (time < 24) {
-            var hours = Math.floor(time);
-            var minutes = Math.round(60 * (time - hours));
-            if (minutes > 0) {
-                return hours + 'h ' + minutes + 'm';
+
+            if (time < 24) {
+                var hours = Math.floor(time);
+                var minutes = Math.round(60 * (time - hours));
+                if (minutes > 0) {
+                    return hours + 'h ' + minutes + 'm';
+                } else {
+                    return hours + 'h';
+                }
             } else {
-                return hours + 'h';
+                time = time / 24;
             }
-        } else {
-            time = time / 24;
-        }
-
-        var days = Math.floor(time);
-        var hours = Math.round(24 * (time - days));
-        if (hours > 0) {
-            return days + 'd ' + hours + 'h';
-        } else {
-            return days + 'd';
-        }
-    },
 
-    /**
-     * Simply returns the value untouched, for when no formatting is required.
-     *
-     * @param {Mixed} value the value to be displayed
-     * @return the untouched value.
-     */
-    plain: function (value) {
-        return value;
-    },
-
-    cssClassEscape: function (value) {
-        return value.toLowerCase().replace('.', '_');
-    },
-};
+            var days = Math.floor(time);
+            var hours = Math.round(24 * (time - days));
+            if (hours > 0) {
+                return days + 'd ' + hours + 'h';
+            } else {
+                return days + 'd';
+            }
+        },
+
+        /**
+         * Simply returns the value untouched, for when no formatting is required.
+         *
+         * @param {Mixed} value the value to be displayed
+         * @return the untouched value.
+         */
+        plain: function (value) {
+            return value;
+        },
+
+        cssClassEscape: function (value) {
+            return value.toLowerCase().replace('.', '_');
+        },
+
+        htmlEncode: function (value) {
+            return !value
+                ? value
+                : String(value).replace(charToEntityRegex, htmlEncodeReplaceFn);
+        },
+    });
+})();
 var fsize = Deluge.Formatters.size;
 var fsize_short = Deluge.Formatters.sizeShort;
 var fspeed = Deluge.Formatters.speed;
@@ -179,3 +203,4 @@ var ftime = Deluge.Formatters.timeRemaining;
 var fdate = Deluge.Formatters.date;
 var fplain = Deluge.Formatters.plain;
 Ext.util.Format.cssClassEscape = Deluge.Formatters.cssClassEscape;
+Ext.util.Format.htmlEncode = Deluge.Formatters.htmlEncode;