Code cleaning

code cosmetics
deleted unused file caliBlur
fixed custom error page

cps/static/js/archive.js

@@ -277,8 +277,6 @@ bitjs.archive = bitjs.archive || {};
             if (e.type === bitjs.archive.UnarchiveEvent.Type.FINISH) {
                 this.worker_.terminate();
             }
-        } else {
-            console.log(e);
         }
     };
 
@@ -292,15 +290,11 @@ bitjs.archive = bitjs.archive || {};
             this.worker_ = new Worker(scriptFileName);
 
             this.worker_.onerror = function(e) {
-                console.log("Worker error: message = " + e.message);
                 throw e;
             };
 
             this.worker_.onmessage = function(e) {
-                if (typeof e.data === "string") {
-                    // Just log any strings the workers pump our way.
-                    console.log(e.data);
-                } else {
+                if (typeof e.data !== "string") {
                     // Assume that it is an UnarchiveEvent.  Some browsers preserve the 'type'
                     // so that instanceof UnarchiveEvent returns true, but others do not.
                     me.handleWorkerEvent_(e.data);

cps/static/js/main.js

@@ -114,8 +114,8 @@ $(function() {
             success: function success(data) {
                 $this.html(buttonText);
 
-                var cssClass = '';
-                var message = ''
+                var cssClass = "";
+                var message = "";
 
                 if (data.success === true) {
                     if (data.update === true) {
@@ -125,19 +125,20 @@ $(function() {
                             .removeClass("hidden")
                             .find("span").html(data.commit);
 
-                        data.history.reverse().forEach(function(entry, index) {
+                        data.history.reverse().forEach(function(entry) {
                             $("<tr><td>" + entry[0] + "</td><td>" + entry[1] + "</td></tr>").appendTo($("#update_table"));
                         });
-                        cssClass = 'alert-warning';
+                        cssClass = "alert-warning";
                     } else {
-                        cssClass = 'alert-success';
+                        cssClass = "alert-success";
                     }
                 } else {
-                    cssClass = 'alert-danger';
+                    cssClass = "alert-danger";
                 }
 
-                message = '<div id="message" class="alert ' + cssClass
-                    + ' fade in"><a href="#" class="close" data-dismiss="alert">&times;</a>' + data.message + '</div>';
+                message = "<div id=\"message\" class=\"alert " + cssClass
+                    + " fade in\"><a href=\"#\" class=\"close\" data-dismiss=\"alert\">&times;</a>"
+                    + data.message + "</div>";
 
                 $(message).insertAfter($("#update_table"));
             }

cps/static/js/table.js

@@ -14,44 +14,45 @@ $(function() {
             }
         });
     });
-    $('#domain-table').bootstrapTable({
+    $("#domain-table").bootstrapTable({
         formatNoMatches: function () {
-        return '';
+            return "";
             },
             striped: false
     });
     $("#btndeletedomain").click(function() {
         //get data-id attribute of the clicked element
-        var domainId = $(this).data('domainId');
+        var domainId = $(this).data("domainId");
         $.ajax({
             method:"post",
             url: window.location.pathname + "/../../ajax/deletedomain",
             data: {"domainid":domainId}
         });
-        $('#DeleteDomain').modal('hide');
+        $("#DeleteDomain").modal("hide");
         $.ajax({
             method:"get",
             url: window.location.pathname + "/../../ajax/domainlist",
             async: true,
             timeout: 900,
             success:function(data){
-                $('#domain-table').bootstrapTable("load", data);
+                $("#domain-table").bootstrapTable("load", data);
             }
         });
 
     });
     //triggered when modal is about to be shown
-    $('#DeleteDomain').on('show.bs.modal', function(e) {
+    $("#DeleteDomain").on("show.bs.modal" function(e) {
         //get data-id attribute of the clicked element and store in button
-        var domainId = $(e.relatedTarget).data('domain-id');
-        $(e.currentTarget).find("#btndeletedomain").data('domainId',domainId);
+        var domainId = $(e.relatedTarget).data("domain-id");
+        $(e.currentTarget).find("#btndeletedomain").data("domainId", domainId);
     });
 });
 
 function TableActions (value, row, index) {
     return [
-        '<a class="danger remove" data-toggle="modal" data-target="#DeleteDomain" data-domain-id="'+row.id+'" title="Remove">',
-        '<i class="glyphicon glyphicon-trash"></i>',
-        '</a>'
-    ].join('');
+        "<a class=\"danger remove\" data-toggle=\"modal\" data-target=\"#DeleteDomain\" data-domain-id=\"" + row.id
+        + "\" title=\"Remove\">",
+        "<i class=\"glyphicon glyphicon-trash\"></i>",
+        "</a>"
+    ].join("");
 }

cps/static/js/unrar.js

@@ -269,7 +269,7 @@ var RD = { //rep decode
 var rBuffer;
 
 // read in Huffman tables for RAR
-function RarReadTables(bstream) {
+function rarReadTables(bstream) {
     var BitLength = new Array(rBC),
         Table = new Array(rHuffTableSize);
     var i;
@@ -480,7 +480,7 @@ function Unpack20(bstream) { //, Solid) {
             continue;
         }
         if (num < 270) {
-            var Distance = rSDDecode[num -= 261] + 1;
+            Distance = rSDDecode[num -= 261] + 1;
             if ((Bits = rSDBits[num]) > 0) {
                 Distance += bstream.readBits(Bits);
             }
@@ -513,9 +513,9 @@ function rarReadTables20(bstream) {
     var BitLength = new Array(rBC20);
     var Table = new Array(rMC20 * 4);
     var TableSize, N, I;
+    var i;
     bstream.readBits(1);
     if (!bstream.readBits(1)) {
-        var i;
         for (i = UnpOldTable20.length; i--;) UnpOldTable20[i] = 0;
     }
     TableSize = rNC20 + rDC20 + rRC20;
@@ -553,12 +553,13 @@ function rarReadTables20(bstream) {
 }
 
 
-function Unpack29(bstream, Solid) {
+function Unpack29(bstream) {
     // lazy initialize rDDecode and rDBits
 
     var DDecode = new Array(rDC);
     var DBits = new Array(rDC);
-
+    var Distance = 0;
+    var Length = 0;
     var Dist = 0, BitLength = 0, Slot = 0;
     var I;
     for (I = 0; I < rDBitLengthCounts.length; I++, BitLength++) {
@@ -571,7 +572,7 @@ function Unpack29(bstream, Solid) {
     var Bits;
     //tablesRead = false;
 
-    rOldDist = [0, 0, 0, 0]
+    rOldDist = [0, 0, 0, 0];
 
     lastDist = 0;
     lastLength = 0;
@@ -579,7 +580,7 @@ function Unpack29(bstream, Solid) {
     for (i = UnpOldTable.length; i--;) UnpOldTable[i] = 0;
     
     // read in Huffman tables
-    RarReadTables(bstream);
+    rarReadTables(bstream);
  
     while (true) {
         var num = rarDecodeNumber(bstream, LD);
@@ -589,12 +590,12 @@ function Unpack29(bstream, Solid) {
             continue;
         }
         if (num >= 271) {
-            var Length = rLDecode[num -= 271] + 3;
+            Length = rLDecode[num -= 271] + 3;
             if ((Bits = rLBits[num]) > 0) {
                 Length += bstream.readBits(Bits);
             }
             var DistNumber = rarDecodeNumber(bstream, DD);
-            var Distance = DDecode[DistNumber]+1;
+            Distance = DDecode[DistNumber] + 1;
             if ((Bits = DBits[DistNumber]) > 0) {
                 if (DistNumber > 9) {
                     if (Bits > 4) {
@@ -625,18 +626,18 @@ function Unpack29(bstream, Solid) {
                     Length++;
                 }
             }
-            RarInsertOldDist(Distance);
-            RarInsertLastMatch(Length, Distance);
+            rarInsertOldDist(Distance);
+            rarInsertLastMatch(Length, Distance);
             rarCopyString(Length, Distance);
             continue;
         }
         if (num === 256) {
-            if (!RarReadEndOfBlock(bstream)) break;
+            if (!rarReadEndOfBlock(bstream)) break;
             continue;
         }
         if (num === 257) {
             //console.log("READVMCODE");
-            if (!RarReadVMCode(bstream)) break;
+            if (!rarReadVMCode(bstream)) break;
             continue;
         }
         if (num === 258) {
@@ -647,7 +648,7 @@ function Unpack29(bstream, Solid) {
         }
         if (num < 263) {
             var DistNum = num - 259;
-            var Distance = rOldDist[DistNum];
+            Distance = rOldDist[DistNum];
 
             for (var I = DistNum; I > 0; I--) {
                 rOldDist[I] = rOldDist[I - 1];
@@ -655,21 +656,21 @@ function Unpack29(bstream, Solid) {
             rOldDist[0] = Distance;
 
             var LengthNumber = rarDecodeNumber(bstream, RD);
-            var Length = rLDecode[LengthNumber] + 2;
+            Length = rLDecode[LengthNumber] + 2;
             if ((Bits = rLBits[LengthNumber]) > 0) {
                 Length += bstream.readBits(Bits);
             }
-            RarInsertLastMatch(Length, Distance);
+            rarInsertLastMatch(Length, Distance);
             rarCopyString(Length, Distance);
             continue;
         }
         if (num < 272) {
-            var Distance = rSDDecode[num -= 263] + 1;
+            Distance = rSDDecode[num -= 263] + 1;
             if ((Bits = rSDBits[num]) > 0) {
                 Distance += bstream.readBits(Bits);
             }
-            RarInsertOldDist(Distance);
-            RarInsertLastMatch(2, Distance);
+            rarInsertOldDist(Distance);
+            rarInsertLastMatch(2, Distance);
             rarCopyString(2, Distance);
             continue;
         }
@@ -677,9 +678,9 @@ function Unpack29(bstream, Solid) {
     rarUpdateProgress()
 }
 
-function RarReadEndOfBlock(bstream) {
+function rarReadEndOfBlock(bstream) {
   
-    rarUpdateProgress()
+    rarUpdateProgress();
 
     var NewTable = false, NewFile = false;
     if (bstream.readBits(1)) {
@@ -689,11 +690,11 @@ function RarReadEndOfBlock(bstream) {
         NewTable = !!bstream.readBits(1);
     }
     //tablesRead = !NewTable;
-    return !(NewFile || NewTable && !RarReadTables(bstream));
+    return !(NewFile || NewTable && !rarReadTables(bstream));
 }
 
 
-function RarReadVMCode(bstream) {
+function rarReadVMCode(bstream) {
     var FirstByte = bstream.readBits(8);
     var Length = (FirstByte & 7) + 1;
     if (Length === 7) {
@@ -717,12 +718,12 @@ function RarAddVMCode(firstByte, vmCode, length) {
     return true;
 }
 
-function RarInsertLastMatch(length, distance) {
+function rarInsertLastMatch(length, distance) {
     lastDist = distance;
     lastLength = length;
 }
 
-function RarInsertOldDist(distance) {
+function rarInsertOldDist(distance) {
     rOldDist.splice(3,1);
     rOldDist.splice(0,0,distance);
 }
@@ -768,7 +769,7 @@ function unpack(v) {
             break;
         case 29: // rar 3.x compression
         case 36: // alternative hash
-            Unpack29(bstream, Solid);
+            Unpack29(bstream);
             break;
     } // switch(method)
   

cps/static/js/unzip.js

@@ -9,7 +9,7 @@
  * ZIP format: http://www.pkware.com/documents/casestudies/APPNOTE.TXT
  * DEFLATE format: http://tools.ietf.org/html/rfc1951
  */
-/* global bitjs */ 
+/* global bitjs, importScripts, Uint8Array*/
 
 // This file expects to be invoked as a Worker (see onmessage below).
 importScripts("io.js");
@@ -44,8 +44,6 @@ var zLocalFileHeaderSignature = 0x04034b50;
 var zArchiveExtraDataSignature = 0x08064b50;
 var zCentralFileHeaderSignature = 0x02014b50;
 var zDigitalSignatureSignature = 0x05054b50;
-var zEndOfCentralDirSignature = 0x06064b50;
-var zEndOfCentralDirLocatorSignature = 0x07064b50;
 
 // takes a ByteStream and parses out the local file information
 var ZipLocalFile = function(bstream) {
@@ -239,7 +237,7 @@ var unzip = function(arrayBuffer) {
         postProgress();
         postMessage(new bitjs.archive.UnarchiveFinishEvent());
   }
-}
+};
 
 // returns a table of Huffman codes 
 // each entry's index is its code and its value is a JavaScript object 
@@ -253,7 +251,7 @@ function getHuffmanCodes(bitLengths) {
 
     // Reference: http://tools.ietf.org/html/rfc1951#page-8
     var numLengths = bitLengths.length,
-        bl_count = [],
+        blCount = [],
         MAX_BITS = 1;
 
     // Step 1: count up how many codes of each length we have
@@ -265,22 +263,22 @@ function getHuffmanCodes(bitLengths) {
             return null;
         }
         // increment the appropriate bitlength count
-        if (bl_count[length] == undefined) bl_count[length] = 0;
+        if (blCount[length] == undefined) blCount[length] = 0;
         // a length of zero means this symbol is not participating in the huffman coding
-        if (length > 0) bl_count[length]++;
+        if (length > 0) blCount[length]++;
 
         if (length > MAX_BITS) MAX_BITS = length;
     }
 
     // Step 2: Find the numerical value of the smallest code for each code length
-    var next_code = [],
+    var nextCode = [],
         code = 0;
     for (var bits = 1; bits <= MAX_BITS; ++bits) {
         var length = bits - 1;
         // ensure undefined lengths are zero
-        if (bl_count[length] == undefined) bl_count[length] = 0;
-        code = (code + bl_count[bits-1]) << 1;
-        next_code[bits] = code;
+        if (blCount[length] == undefined) blCount[length] = 0;
+        code = (code + blCount[bits - 1]) << 1;
+        nextCode [bits] = code;
     }
 
     // Step 3: Assign numerical values to all codes
@@ -288,9 +286,9 @@ function getHuffmanCodes(bitLengths) {
     for (var n = 0; n < numLengths; ++n) {
         var len = bitLengths[n];
         if (len != 0) {
-            table[next_code[len]] = { length: len, symbol: n }; //, bitstring: binaryValueToString(next_code[len],len) };
+            table[nextCode [len]] = { length: len, symbol: n }; //, bitstring: binaryValueToString(nextCode [len],len) };
             tableLength++;
-            next_code[len]++;
+            nextCode [len]++;
         }
     }
     table.maxLength = tableLength;
@@ -321,7 +319,8 @@ function getFixedLiteralTable() {
     // create once
     if (!fixedHCtoLiteral) {
         var bitlengths = new Array(288);
-        for (var i = 0; i <= 143; ++i) bitlengths[i] = 8;
+        var i;
+        for (i = 0; i <= 143; ++i) bitlengths[i] = 8;
         for (i = 144; i <= 255; ++i) bitlengths[i] = 9;
         for (i = 256; i <= 279; ++i) bitlengths[i] = 7;
         for (i = 280; i <= 287; ++i) bitlengths[i] = 8;
@@ -335,7 +334,9 @@ function getFixedDistanceTable() {
     // create once
     if (!fixedHCtoDistance) {
         var bitlengths = new Array(32);
-        for (var i = 0; i < 32; ++i) { bitlengths[i] = 5; }
+        for (var i = 0; i < 32; ++i) {
+            bitlengths[i] = 5;
+        }
 
         // get huffman code table
         fixedHCtoDistance = getHuffmanCodes(bitlengths);
@@ -347,7 +348,6 @@ function getFixedDistanceTable() {
 // then return that symbol
 function decodeSymbol(bstream, hcTable) {
     var code = 0, len = 0;
-    var match = false;
 
     // loop until we match
     for (;;) {
@@ -446,10 +446,9 @@ function inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer) {
                    stream, and copy length bytes from this
                    position to the output stream.
     */
-    var numSymbols = 0, blockSize = 0;
+    var blockSize = 0;
     for (;;) {
         var symbol = decodeSymbol(bstream, hcLiteralTable);
-        ++numSymbols;
         if (symbol < 256) {
             // copy literal byte to output
             buffer.insertByte(symbol);
@@ -485,7 +484,7 @@ function inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer) {
                         buffer.insertByte(data[ch++]);
                     }
                 } else {
-                  buffer.insertBytes(buffer.data.subarray(ch, ch + length))
+                  buffer.insertBytes(buffer.data.subarray(ch, ch + length));
                 }
 
             } // length-distance pair
@@ -516,8 +515,8 @@ function inflate(compressedData, numDecompressedBytes) {
         if (bType == 0) {
             // skip remaining bits in this byte
             while (bstream.bitPtr != 0) bstream.readBits(1);
-            var len = bstream.readBits(16),
-                nlen = bstream.readBits(16);
+            var len = bstream.readBits(16);
+            bstream.readBits(16);
                 // TODO: check if nlen is the ones-complement of len?
 
             if (len > 0) buffer.insertBytes(bstream.readBytes(len));
@@ -593,9 +592,8 @@ function inflate(compressedData, numDecompressedBytes) {
             var hcLiteralTable = getHuffmanCodes(literalCodeLengths),
                 hcDistanceTable = getHuffmanCodes(distanceCodeLengths);
             blockSize = inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer);
-        }
+        } else {
             // error
-        else {
             err("Error! Encountered deflate block of type 3");
             return null;
         }

cps/templates/http_error.html

@@ -13,7 +13,7 @@
     <link href="{{ url_for('static', filename='css/libs/bootstrap.min.css') }}" rel="stylesheet" media="screen">
     <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
     {% if g.user.get_theme == 1 %}
-       <link href="{{ url_for('static', filename='css/caliBlur-style.css') }}" rel="stylesheet" media="screen">
+       <link href="{{ url_for('static', filename='css/caliBlur.min.css') }}" rel="stylesheet" media="screen">
     {% endif %}
   </head>
   <body>

cps/web.py

@@ -944,14 +944,14 @@ def check_valid_domain(domain_text):
     return len(result)
 
 
-''' POST /post
-    name:  'username',  //name of field (column in db)
-    pk:    1            //primary key (record id)
-    value: 'superuser!' //new value'''
 @app.route("/ajax/editdomain", methods=['POST'])
 @login_required
 @admin_required
 def edit_domain():
+    ''' POST /post
+        name:  'username',  //name of field (column in db)
+        pk:    1            //primary key (record id)
+        value: 'superuser!' //new value'''
     vals = request.form.to_dict()
     answer = ub.session.query(ub.Registration).filter(ub.Registration.id == vals['pk']).first()
     # domain_name = request.args.get('domain')
@@ -1160,8 +1160,8 @@ def get_update_status():
             r = requests.get(repository_url + '/git/refs/heads/master')
             r.raise_for_status()
             commit = r.json()
-        except requests.exceptions.HTTPError as ex:
-            status['message'] = _(u'HTTP Error') + ' ' + str(ex)
+        except requests.exceptions.HTTPError as e:
+            status['message'] = _(u'HTTP Error') + ' ' + str(e)
         except requests.exceptions.ConnectionError:
             status['message'] = _(u'Connection error')
         except requests.exceptions.Timeout: