Remove inline javascript from login page

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 879972e0332dc13e2718d0efd7af0646ccd6b049..a077d4c4da65f18499f0af44d1f3e5709048e79f 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -1,4 +1,4 @@
-require 'stringio'
+require "stringio"

 
 # The Potlatch module provides helper functions for potlatch and its communication with the server
 module Potlatch
 
 # The Potlatch module provides helper functions for potlatch and its communication with the server
 module Potlatch


@@ -24,7 +24,7 @@ module Potlatch
 
     # Return eight-byte double-precision float
     def self.getdouble(s)
 
     # Return eight-byte double-precision float
     def self.getdouble(s)

-      a = s.read(8).unpack('G')                        # G big-endian, E little-endian
+      a = s.read(8).unpack("G")        # G big-endian, E little-endian

       a[0]
     end
 
       a[0]
     end
 


@@ -39,26 +39,26 @@ module Potlatch
     def self.getobject(s)
       arr = {}
       while (key = getstring(s))
     def self.getobject(s)
       arr = {}
       while (key = getstring(s))

-        break if key == ''
+        break if key == ""

         arr[key] = getvalue(s)
       end
         arr[key] = getvalue(s)
       end

-      s.getbyte                # skip the 9 'end of object' value
+      s.getbyte        # skip the 9 'end of object' value

       arr
     end
 
     # Parse and get value
     def self.getvalue(s)
       case s.getbyte
       arr
     end
 
     # Parse and get value
     def self.getvalue(s)
       case s.getbyte

-      when 0 then return getdouble(s)                  # number
-      when 1 then return s.getbyte                     # boolean
-      when 2 then return getstring(s)                  # string
-      when 3 then return getobject(s)                  # object/hash
-      when 5 then return nil                           # null
-      when 6 then return nil                           # undefined
-      when 8 then s.read(4)                            # mixedArray
-                  return getobject(s)                  #  |
-      when 10 then return getarray(s)                  # array
-      else         return nil                          # error
+      when 0 then return getdouble(s)                  # number
+      when 1 then return s.getbyte                     # boolean
+      when 2 then return getstring(s)                  # string
+      when 3 then return getobject(s)                  # object/hash
+      when 5 then return nil                           # null
+      when 6 then return nil                           # undefined
+      when 8 then s.read(4)                            # mixedArray
+                  return getobject(s)                  #  |
+      when 10 then return getarray(s)                  # array
+      else         return nil                          # error

       end
     end
 
       end
     end
 


@@ -74,27 +74,27 @@ module Potlatch
     # Pack variables as AMF
     def self.encodevalue(n)
       case n.class.to_s
     # Pack variables as AMF
     def self.encodevalue(n)
       case n.class.to_s

-      when 'Array'
+      when "Array"

         a = 10.chr + encodelong(n.length)
         n.each do |b|
           a += encodevalue(b)
         end
         a
         a = 10.chr + encodelong(n.length)
         n.each do |b|
           a += encodevalue(b)
         end
         a

-      when 'Hash'
+      when "Hash"

         a = 3.chr
         n.each do |k, v|
           a += encodestring(k.to_s) + encodevalue(v)
         end
         a + 0.chr + 0.chr + 9.chr
         a = 3.chr
         n.each do |k, v|
           a += encodestring(k.to_s) + encodevalue(v)
         end
         a + 0.chr + 0.chr + 9.chr

-      when 'String'
+      when "String"

         2.chr + encodestring(n)
         2.chr + encodestring(n)

-      when 'Bignum', 'Fixnum', 'Float'
+      when "Bignum", "Fixnum", "Float"

         0.chr + encodedouble(n)
         0.chr + encodedouble(n)

-      when 'NilClass'
+      when "NilClass"

         5.chr
         5.chr

-      when 'TrueClass'
+      when "TrueClass"

         0.chr + encodedouble(1)
         0.chr + encodedouble(1)

-      when 'FalseClass'
+      when "FalseClass"

         0.chr + encodedouble(0)
       else
         Rails.logger.error("Unexpected Ruby type for AMF conversion: " + n.class.to_s)
         0.chr + encodedouble(0)
       else
         Rails.logger.error("Unexpected Ruby type for AMF conversion: " + n.class.to_s)


@@ -110,12 +110,12 @@ module Potlatch
 
     # Encode number as eight-byte double precision float
     def self.encodedouble(n)
 
     # Encode number as eight-byte double precision float
     def self.encodedouble(n)

-      [n].pack('G')
+      [n].pack("G")

     end
 
     # Encode number as four-byte long
     def self.encodelong(n)
     end
 
     # Encode number as four-byte long
     def self.encodelong(n)

-      [n].pack('N')
+      [n].pack("N")

     end
   end
 
     end
   end
 


@@ -175,15 +175,15 @@ module Potlatch
 
       # Read preset menus
       presets = {}
 
       # Read preset menus
       presets = {}

-      presetmenus = { 'point' => [], 'way' => [], 'POI' => [] }
-      presetnames = { 'point' => {}, 'way' => {}, 'POI' => {} }
-      presettype = ''
-      presetcategory = ''
+      presetmenus = { "point" => [], "way" => [], "POI" => [] }
+      presetnames = { "point" => {}, "way" => {}, "POI" => {} }
+      presettype = ""
+      presetcategory = ""

       #        StringIO.open(txt) do |file|
       File.open("#{Rails.root}/config/potlatch/presets.txt") do |file|
         file.each_line do|line|
           t = line.chomp
       #        StringIO.open(txt) do |file|
       File.open("#{Rails.root}/config/potlatch/presets.txt") do |file|
         file.each_line do|line|
           t = line.chomp

-          if t =~ /(\w+)\/(\w+)/
+          if t =~ %r{(\w+)/(\w+)}

             presettype = $1
             presetcategory = $2
             presetmenus[presettype].push(presetcategory)
             presettype = $1
             presetcategory = $2
             presetmenus[presettype].push(presetcategory)


@@ -193,7 +193,7 @@ module Potlatch
             kv = $2
             presetnames[presettype][presetcategory].push(pre)
             presets[pre] = {}
             kv = $2
             presetnames[presettype][presetcategory].push(pre)
             presets[pre] = {}

-            kv.split(',').each do|a|
+            kv.split(",").each do|a|

               presets[pre][$1] = $2 if a =~ /^(.+)=(.*)$/
             end
           end
               presets[pre][$1] = $2 if a =~ /^(.+)=(.*)$/
             end
           end


@@ -209,9 +209,9 @@ module Potlatch
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 
           tag = $1
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 
           tag = $1

-          colours[tag] = $2.hex if $2 != '-'
-          casing[tag] = $3.hex if $3 != '-'
-          areas[tag] = $4.hex if $4 != '-'
+          colours[tag] = $2.hex if $2 != "-"
+          casing[tag] = $3.hex if $3 != "-"
+          areas[tag] = $4.hex if $4 != "-"

         end
       end
 
         end
       end
 


@@ -224,9 +224,9 @@ module Potlatch
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 
           tag = $1
           next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
 
           tag = $1

-          relcolours[tag] = $2.hex if $2 != '-'
-          relalphas[tag] = $3.to_i if $3 != '-'
-          relwidths[tag] = $4.to_i if $4 != '-'
+          relcolours[tag] = $2.hex if $2 != "-"
+          relalphas[tag] = $3.to_i if $3 != "-"
+          relwidths[tag] = $4.to_i if $4 != "-"

         end
       end
 
         end
       end
 


@@ -243,18 +243,18 @@ module Potlatch
       icon_list.reverse!
 
       # Read auto-complete
       icon_list.reverse!
 
       # Read auto-complete

-      autotags = { 'point' => {}, 'way' => {}, 'POI' => {} }
+      autotags = { "point" => {}, "way" => {}, "POI" => {} }

       File.open("#{Rails.root}/config/potlatch/autocomplete.txt") do |file|
         file.each_line do|line|
       File.open("#{Rails.root}/config/potlatch/autocomplete.txt") do |file|
         file.each_line do|line|

-          next unless line.chomp =~ /^([\w:]+)\/(\w+)\s+(.+)$/
+          next unless line.chomp =~ %r{^([\w:]+)/(\w+)\s+(.+)$}

 
           tag = $1
           type = $2
           values = $3
 
           tag = $1
           type = $2
           values = $3

-          if values == '-'
+          if values == "-"

             autotags[type][tag] = []
           else
             autotags[type][tag] = []
           else

-            autotags[type][tag] = values.split(',').sort.reverse
+            autotags[type][tag] = values.split(",").sort.reverse

           end
         end
       end
           end
         end
       end