six-updater-web 0.22.4 → 0.23.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.22.4'
+  s.version = '0.23.0'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six-updater-web/app/controllers/config_controller.rb

@@ -16,6 +16,10 @@ class ConfigController < ApplicationController
 
     @userconfigs = Dir.chdir(path) { Dir["userconfig/**/*"].reject {|e| File.directory?(e) || File.dirname(e)[/_[0-9]*$/]} }
     @userconfigs += ["ban.txt"]
+    if setting.real_params =~ /-cfg=([\w\.]*)/
+      logger.info "Server Config: #{$1}"
+      @userconfigs += [$1]
+    end
     cfg = params["options"] && params["options"]["userconfig"] ? params["options"]["userconfig"] : @userconfigs[0]
     case params["commit"]
       when "Edit"
@@ -23,16 +27,21 @@ class ConfigController < ApplicationController
         return
     end
     @userconfig = File.exists?(File.join(path, cfg)) ? File.open(File.join(path, cfg)) {|a| Iconv.new("utf-8//IGNORE//TRANSLIT", "utf-8").iconv(a.read + ' ')[0..-2].split("\n").map{|e| e.sub("\r", "")}.join("\n") } : ""
+    @setting = setting
   end
 
   def edit
-    path = Appsetting.find(params["setting"]).real_path.gsub("\\", "/")
+    setting = Appsetting.find(params["setting"])
+    path = setting.real_path.gsub("\\", "/")
     @userconfig = File.exists?(File.join(path, params["options"]["userconfig"])) ? File.open(File.join(path, params["options"]["userconfig"])) {|a| Iconv.new("utf-8//IGNORE//TRANSLIT", "utf-8").iconv(a.read + ' ')[0..-2].split("\n").map{|e| e.sub("\r", "")}.join("\n") } : ""
+    @setting = setting
   end
 
   def show
-    path = Appsetting.find(params["setting"]).real_path.gsub("\\", "/")
+    setting = Appsetting.find(params["setting"])
+    path = setting.real_path.gsub("\\", "/")
     @userconfig = File.exists?(File.join(path, params["options"]["userconfig"])) ? File.open(File.join(path, params["options"]["userconfig"])) {|a| Iconv.new("utf-8//IGNORE//TRANSLIT", "utf-8").iconv(a.read + ' ')[0..-2].split("\n").map{|e| e.sub("\r", "")}.join("\n") } : ""
+    @setting = setting
   end
 
   def update

data/lib/six-updater-web/app/controllers/main_controller.rb

@@ -1,6 +1,7 @@
 class MainController < ApplicationController
   def index
-    @msg = []
+    @msg, @error, @status = [], [], []
+    @pm = false
     @skip, @install, @check, @disabled, @special = [], [], [], [], []
     preset, queryserver, server, action, setting, reset, ok = nil, nil, nil, nil, nil, false, true
     grab = false
@@ -27,7 +28,7 @@ class MainController < ApplicationController
       rescue => e
         logger.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
         "FAILURE: #{$!}"
-      end + "<br />"
+      end
     end
 
     gs_ok, gs_geo = true, true
@@ -59,7 +60,7 @@ class MainController < ApplicationController
 
       when "synchronize"
         if !ok
-          @msg << @system_setting.sync + "<br />"
+          @msg << @system_setting.sync
         end
         grab = true
 
@@ -84,14 +85,15 @@ class MainController < ApplicationController
         end
 
         if gslist_installed
-          @msg << "Updating Gamespy...This will take a while, please wait until done!<br />"
+          @msg << "Updating Gamespy...This will take a while, please wait until done!"
           if gs_geo
             @system_setting.update_gamespy #(true)
           else
             @system_setting.update_gamespy_nogeo #(true)
           end
         else
-          @msg << "<b>ERROR: gslist tool is missing!</b><br />Please download from <a href=\"http://six.dev-heaven.net/wagn/Six_Updater_Suite+download+gslist\" target=\"_blank\">Six Updater Wagn</a>, and put in #{SixUpdaterWeb::TOOL_PATH}<br />"
+          @error << "<b>ERROR: gslist tool is missing!</b>"
+          @error << "Please download from <a href=\"http://six.dev-heaven.net/wagn/Six_Updater_Suite+download+gslist\" target=\"_blank\">Six Updater Wagn</a>, and put in #{SixUpdaterWeb::TOOL_PATH}"
         end
 
       when "prune_gamespy"
@@ -107,11 +109,11 @@ class MainController < ApplicationController
         if params["really"]
           if params["really"]["sure"] == "1"
             Queryserver.purge
-            @msg << "Purged Gamespy...<br />"
+            @msg << "Purged Gamespy..."
             d = true
           end
         end
-        @msg << "<b>ERROR: Please confirm by checking the checkbox</b><br />" if !d
+        @error << "<b>ERROR: Please confirm by checking the checkbox</b>" if !d
     end
 
     begin
@@ -208,20 +210,20 @@ class MainController < ApplicationController
     end
 
     if preset
-      @msg << "Using preset: <a href='/sixconfigs/edit/#{preset.id}' title='#{preset.mods.map{|e| e.name}.join(", ")}'>#{preset.name}</a>"
+      @status << "Preset: <a href='/sixconfigs/edit/#{preset.id}' title='#{preset.mods.map{|e| e.name}.join(", ")}'>#{preset.name}</a>"
     else
-      @msg << "No preset selected!"
+      @status << "No preset selected!"
       act(setting, preset, action, server)
       return
     end
 
     unless params["all"]
       if server
-        @msg << "Override server: <a href='/queryservers/edit/#{queryserver.id}' title='#{queryserver.mods.map{|e| e.name}.join(", ")}'>#{queryserver.to_label}</a>"
+        @status << "Override server: <a href='/queryservers/edit/#{queryserver.id}' title='#{queryserver.country}, #{queryserver.ping}ms .Mods: #{queryserver.mods.map{|e| e.name}.join(", ")}'>#{queryserver.to_label}</a>"
       else
         if preset.get_server
           server = preset.get_server
-          @msg << "Preset server: <a href='/servers/edit/#{server.id}' title='#{server.mods.map{|e| e.name}.join(", ")}'>#{server.to_label}"
+          @status << "Preset server: <a href='/servers/edit/#{server.id}' title='#{server.mods.map{|e| e.name}.join(", ")}'>#{server.to_label}"
         end
       end
     end
@@ -229,22 +231,22 @@ class MainController < ApplicationController
     if setting
       setting.beta = @beta unless @beta.nil?
       setting.server = @server_bool unless @server_bool.nil?
-      @msg << "Override settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.class.short}: #{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
+      @status << "Override settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.class.short}: #{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
     else
       if preset.appsetting
         setting = preset.appsetting
         setting.beta = @beta unless @beta.nil?
         setting.server = @server_bool unless @server_bool.nil?
-        @msg << "Preset settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.class.short}: #{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
+        @status << "Preset settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.class.short}: #{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
       end
     end
 
     if action
-      @msg << "Override action: #{action.name}"
+      @status << "Override action: <a href='/actions/edit/#{action.id}' title='#{action.tasks.join(",") if action.tasks.is_a?(Array)}'>#{action.name}</a>"
     else
       if preset.action
         action = preset.action
-        @msg << "Preset action: #{action.name}"
+        @status << "Preset action: #{action.name}"
       end
     end
 
@@ -252,24 +254,24 @@ class MainController < ApplicationController
       setting = Arma2Appsetting.new(:beta => @beta, :server => @server_bool)
     end
 
-    @msg << "Resetting skip status." if reset
+    @msg << "Skip status reset!" if reset
     if setting.real_path
       unless File.directory?(setting.real_path)
-        @msg << "<br /><b>WARNING:</b> ArmA folder not set or non existent: #{setting.real_path}"
+        @error << "<b>WARNING:</b> ArmA folder not set or non existent: #{setting.real_path}"
       end
     else
-      @msg << "<br /><b>WARNING:</b> ArmA folder not set or non existent: #{setting.real_path}"
+      @error << "<b>WARNING:</b> ArmA folder not set or non existent: #{setting.real_path}"
     end
 
     if setting.modpath
       unless File.directory?(setting.real_modpath)
-        @msg << "<br /><b>WARNING:</b> Mod installation folder not set or non existent: #{setting.real_modpath}"
+        @error << "<b>WARNING:</b> Mod installation folder not set or non existent: #{setting.real_modpath}"
       end
     end
 
     procs = setting.processes
     unless procs.empty?
-      @msg << "<br /><b>WARNING:</b> There seem to be open arma processes: #{setting.real_exe}<br />Pids: #{procs}"
+      @error << "<b>WARNING:</b> There seem to be open arma processes: #{setting.real_exe} - Pids: #{procs}"
     end
 
     preset.all_mods(server, setting).each do |mod|
@@ -280,8 +282,10 @@ class MainController < ApplicationController
         mod.update_skip if @autoskip
       end
       mod.save unless mod.new_record?
-      mod.disabled = true if !mod.version_match?(setting)
-      if mod.special 
+
+      mod.disabled = true if (!mod.exists?(setting) || mod.installed? || mod.class.appset::SPECIFIC) && !mod.version_match?(setting)
+      #mod.skip = true if (mod.exists?(setting) && !mod.has_rsync?(setting))         
+      if mod.special
         @special << mod
         next
       end
@@ -322,13 +326,17 @@ class MainController < ApplicationController
         return
 
       when "server mod check"
-        @server_check = true
-        @signatures = queryserver.signatures
-        @allowed, @disallowed, @garbage = *setting.allowance(@signatures)
+        if queryserver
+          @server_check = true
+          @signatures = queryserver.signatures
+          @allowed, @disallowed, @garbage = *setting.allowance(@signatures)
+        else
+          @error << "No server selected!"
+        end
 
       when "save"
         preset.output_yml(setting, server)
-        @msg << "<br />Saved six-updater.yml!"
+        @msg << "Saved six-updater.yml!"
 
       when "execute"
         preset.execute(action, setting, server, @autoskip, @inweb)
@@ -339,11 +347,13 @@ class MainController < ApplicationController
           return
         end
 
-        @msg << "<br />Saved six-updater.yml!<br /><b>A window should open displaying the update process progress</b>"
+        @msg << "Saved six-updater.yml!"
+        @msg << "<b>A window should open displaying the update process progress</b>"
 
-      when "stop game"
-        setting.processes.each { |entry| @msg << "Process to be killed: #{entry}" }
-        setting.kill!
+      when "app manager"
+        #setting.processes.each { |entry| @msg << "Process to be killed: #{entry}" }
+        #setting.kill!
+        @pm = true
 
       when "read mods"
         Mod.read_modfolders(setting)
@@ -356,6 +366,19 @@ class MainController < ApplicationController
     act(setting, preset, action, server)
   end
 
+  def pm
+    @setting = Appsetting.find(params[:setting])
+    @msg = []
+    if params[:kill_all]
+      @setting.processes.each { |entry| @msg << "Process to be killed: #{entry}" }
+      @setting.kill!
+    end
+    if params[:kill]
+      procs = params[:kill].split(",")
+      procs.each { |entry| @msg << "Process to be killed: #{entry}"; Six::Appmanager.kill(entry) }
+    end
+  end
+
   def fetch
     @system_setting = SystemSetting.singleton
     setting = nil

data/lib/six-updater-web/app/controllers/queryservers_controller.rb

@@ -7,12 +7,12 @@ class QueryserversController < ApplicationController
 
     config.columns = [:name, :ip, :port, :numplayers, :ping, :country, :gametype, :mission, :mapname, :mods, :saved_password, :updated_at,
                       :password, :sv_battleye, :verifysignatures, :dedicated, :favorite, :difficulty, :gamestate, :gamemode,
-                      :language, :gamever, :platform, :exec2, :mod, :signatures, :players]
+                      :language, :gamever, :platform, :exec2, :mod, :signatures, :players, :export_to_preset]
     config.list.columns.exclude :saved_password, :ip, :port, :gamestate, :language, :difficulty, :gamemode, :mapname, :platform,
-                                :sv_battleye, :players, :signatures, :mod
+                                :sv_battleye, :players, :signatures, :mod, :export_to_preset
     config.show.columns.exclude :mission # :players # Encoding problem when both are displayed, with russian text?
-    config.update.columns.exclude :exec2
-    config.create.columns.exclude :exec2
+    config.update.columns.exclude :exec2, :export_to_preset
+    config.create.columns.exclude :exec2, :export_to_preset
     config.list.sorting = {:numplayers => :desc} #{ :name => :asc }
 
     config.columns[:dedicated].label = "Ded"
@@ -34,6 +34,12 @@ class QueryserversController < ApplicationController
     end
   end
 
+  def export
+    record = Queryserver.find(params[:id])
+    cfg = record.export_to_preset
+    redirect_to "/sixconfigs/edit/#{cfg.id}"
+  end
+
   def latest
     @record = Queryserver.find(params[:id])
     @record.latest

data/lib/six-updater-web/app/helpers/mods_helper.rb

@@ -15,6 +15,6 @@ module ModsHelper
   end
 
   def type_form_column(record, t, options)
-    collection_select(:record, :type, ["Arma2Mod", "Arma2StMod", "Arma2OaMod", "Arma2OaStMod", "Arma2OaCoMod"], :to_s, :to_s, {:name => options[:name]})
+    collection_select(:record, :type, ["Arma2Mod", "Arma2CaMod", "Arma2StMod", "Arma2OaMod", "Arma2OaStMod", "Arma2OaCoMod"], :to_s, :to_s, {:name => options[:name]})
   end
 end

data/lib/six-updater-web/app/helpers/queryservers_helper.rb

@@ -5,4 +5,8 @@ module QueryserversHelper
   def name_column(record, b = nil)
     auto_link record.name if record.name
   end
+
+  def export_to_preset_column(record, b = nil)
+    link_to "Export to new Preset", "/queryservers/export/#{record.id}"
+  end
 end

data/lib/six-updater-web/app/models/appsetting.rb

@@ -19,6 +19,7 @@ class Appsetting < ActiveRecord::Base
   DEFAULT_PARAMS = "-showScriptErrors -noSplash -noFilePatching"
   DEFAULT_MODS_PARAM = "-mod=" # TODO
   DEFAULT_BETA_MODS = ["beta"]
+  STATIC_TYPES = []
 
   # TODO: Auto enumurate from model properties?
   # folders: expansion, common, addons
@@ -70,6 +71,8 @@ class Appsetting < ActiveRecord::Base
       t << e
       e = e.superclass
     end
+    t += self::STATIC_TYPES
+    t.uniq!
     t
   end
 

data/lib/six-updater-web/app/models/arma2_ca_appsetting.rb

@@ -0,0 +1,8 @@
+class Arma2CaAppsetting < Arma2Appsetting
+  FRIENDLY_NAME = "ArmA 2 (CA)"
+  #SPECIFIC = true
+  #REGKEYS = {"Arma2" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2', 'MAIN']}
+
+  #FAMILY = Hash.new
+  #FAMILY["Arma2"] = [["arma2.exe", "arma2server.exe"], {"Arma2St" => []}]
+end

data/lib/six-updater-web/app/models/arma2_ca_mod.rb

@@ -0,0 +1,3 @@
+class Arma2CaMod < Arma2Mod
+  #Code here
+end

data/lib/six-updater-web/app/models/arma2_mod.rb

@@ -1,3 +1,3 @@
 class Arma2Mod < Mod
   #Code here
-end
+end

data/lib/six-updater-web/app/models/arma2_oa_co_appsetting.rb

@@ -5,5 +5,5 @@ class Arma2OaCoAppsetting < Arma2OaAppsetting
 # TODO: Evaluate
 # Perhaps look at adding a boolean: specific, so when it is enabled, non of the inherited editions can be used?
 # Since Arma2 standalone addons should work on OaCo, yet you would loose the specific 'arma2standalone only' option
-
+  STATIC_TYPES = [Arma2CaAppsetting]
 end

data/lib/six-updater-web/app/models/arma2_st_appsetting.rb

@@ -1,4 +1,4 @@
-class Arma2StAppsetting < Arma2Appsetting
+class Arma2StAppsetting < Arma2CaAppsetting
   FRIENDLY_NAME = "ArmA 2 (Standalone)"
   SPECIFIC = true
   REGKEYS = {"Arma2" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2', 'MAIN']}

data/lib/six-updater-web/app/models/arma2_st_mod.rb

@@ -1,3 +1,3 @@
-class Arma2StMod < Arma2Mod
+class Arma2StMod < Arma2CaMod
   #Code here
-end
+end

data/lib/six-updater-web/app/models/mod.rb

@@ -23,11 +23,15 @@ class Mod < ActiveRecord::Base
     mods.uniq
   end
 
+  def self.appset
+    Kernel.const_get(self.short+"Appsetting")
+  end
+
 
   # arma2 mod: works for all subclasses
   # armaoa mod; works for arma2-oa-st, arma2-oa-
   def self.label
-    Kernel.const_get(self.short+"Appsetting").label
+    self.appset.label
   end
 
   def self.short
@@ -37,6 +41,7 @@ class Mod < ActiveRecord::Base
   def self.types
     return [Arma2Mod] if self.class == Appsetting
     e = self
+    types = []
     unless e.nil? || [Mod, ActiveRecord::Base].include?(e)
       types << e
       e = e.class
@@ -73,6 +78,11 @@ class Mod < ActiveRecord::Base
     File.exists?(File.join(setting.real_modpath, self.real_name))
   end
 
+  def has_rsync?(setting)
+    return false unless setting.real_modpath && self.real_name
+    File.exists?(File.join(setting.real_modpath, self.real_name, ".rsync"))
+  end
+
   def remote
     
   end

data/lib/six-updater-web/app/models/queryserver.rb

@@ -12,6 +12,17 @@ class Queryserver < ActiveRecord::Base
   has_and_belongs_to_many :mods
   has_many :sixconfigs
 
+
+  def export
+
+  end
+
+  def export_to_preset
+    cfg = Sixconfig.new(:name => "CUST - #{self.name} clone", :mods => self.mods)
+    cfg.save
+    cfg
+  end
+
   def address
     [self.ip, self.port].join(":")
   end

data/lib/six-updater-web/app/views/config/edit.haml

@@ -1,6 +1,8 @@
-= link_to "Back to index", "/config"
+= link_to @setting.name, "/appsettings/edit/#{@setting.id}", {:title => "#{@setting.real_exe} (#{@setting.real_path})"}
 %br
-- form_tag("/config/update", {:method => :get}) do
+= link_to "Back to index", "/config/?setting=#{params["setting"]}"
+%br
+- form_tag("/config/update") do
   %input{:type => "hidden", :name => "options[userconfig]", :value => params["options"]["userconfig"]}
   %input{:type => "hidden", :name => "setting", :value => params["setting"]}
   = submit_tag "Reload"

data/lib/six-updater-web/app/views/config/index.haml

@@ -1,4 +1,5 @@
-- form_tag({}, {:method => :get}) do
+= link_to @setting.name, "/appsettings/edit/#{@setting.id}", {:title => "#{@setting.real_exe} (#{@setting.real_path})"}
+- form_tag do
   %input{:type => "hidden", :name => "setting", :value => params["setting"]}
   = select( "options", "userconfig", @userconfigs, {:selected => "#{params["options"]["userconfig"] if params["options"]}"})
   = submit_tag "Change"

data/lib/six-updater-web/app/views/config/show.haml

@@ -1,4 +1,6 @@
-= link_to "Back to index", "/config"
+= link_to @setting.name, "/appsettings/edit/#{@setting.id}", {:title => "#{@setting.real_exe} (#{@setting.real_path})"}
+%br
+= link_to "Back to index", "/config/?setting=#{params["setting"]}"
 %br
 = link_to "Edit", "/config/edit/?setting=#{params["setting"]}&options[userconfig]=#{params["options"]["userconfig"]}"
 %br

data/lib/six-updater-web/app/views/main/_left.haml

@@ -1,7 +1,6 @@
 %table{ :border => 1, :width => "100%"}
   %tr
     %td
-      = link_to "Follow with Google Wave", "/main/wave"
       - form_tag :action => :index do
         %p
           %label{ :for => "sixconfigs" }
@@ -46,20 +45,21 @@
           %a{:title => "Display updater output into ajax-refreshed web-page (Handy for remote-management)" }
             Remote
           = check_box :system, :inweb, {:checked => @inweb}
+        %strong Actions
         %p
           = submit_tag "Execute"
            
           = submit_tag "Save"
            
-          = submit_tag "Stop Game"
+          = submit_tag "App Manager"
            
-          = submit_tag "Reset Skip Status"
+          = submit_tag "Edit Userconfig"
         %p
+          = submit_tag "Reset Skip Status"
+           
           = submit_tag "Show status"
            
           = submit_tag "Server Mod check"
-           
-          = submit_tag "Edit Userconfig"
       %strong Logs
       - form_tag :action => :fetch do
         %p
@@ -67,4 +67,5 @@
            
           = submit_tag "Updater"
            
-          = submit_tag "Updater-Web"
+          = submit_tag "Updater-Web"
+      = link_to "Follow with Google Wave", "/main/wave"

data/lib/six-updater-web/app/views/main/_pm.haml

@@ -0,0 +1,7 @@
+Process Manager
+%br
+= link_to "Kill all", "/main/pm/?setting=#{@setting.id}&kill_all=true"
+- @setting.processes.each do |p|
+  = p
+  = link_to "Kill", "/main/pm/?setting=#{@setting.id}&kill=#{p}"
+  %br

data/lib/six-updater-web/app/views/main/_right.haml

@@ -2,38 +2,54 @@
   %tr
     %td
       Edition: #{link_to @current_setting.nice_edition, nil, :title => "Supports mods for: #{@current_setting.found_types.map{|e| e.label}.join(", ")}" }
+      - if @status.size > 0
+        %br
+        = @status.join("<br />")
+        %br
+      Last sync #{@system_setting.synchronized_at ? time_ago_in_words(@system_setting.synchronized_at) + " ago" : "never"}.
+      Gamespy #{@system_setting.gamespied_at ? time_ago_in_words(@system_setting.gamespied_at) + " ago" : "never"}.
       %br
-      Last sync #{@system_setting.synchronized_at ? time_ago_in_words(@system_setting.synchronized_at) + " ago" : "never"}
-      Gamespy #{@system_setting.gamespied_at ? time_ago_in_words(@system_setting.gamespied_at) + " ago" : "never"}
-      %br
-      %br
-      = @msg.join("<br />")
-      %br
-      Autoskip: #{@autoskip ? "Enabled" : "Disaabled"}.
-      %br
+      - unless params[:commit] == "none"
+        %br
+        #{params[:commit]}
+      - if @msg.size > 0
+        %br
+        %div{:class => "green"}
+          %ul
+            - @msg.each do |m|
+              %li= m
+      - if @error.size > 0
+        %br
+        %div{:class => "red"}
+          %ul
+            - @error.each do |e|
+              %li= e
+%table{ :border => 1, :cellpadding => "5", :width => "100%"}
+  %tr
+    %td
       - if (@check.size + @skip.size + @install.size + @disabled.size + @special.size) > 0
         - if @check.size > 0
-          %br
-          To be checked:
+          %b To be checked
           %br
           = render :partial => "check", :locals => {:mods => @check}
-        - if @skip.size > 0
           %br
-          To be skipped:
+        - if @skip.size > 0
+          %b To be skipped
           %br
           = render :partial => "check", :locals => {:mods => @skip}
-        - if @install.size > 0
           %br
-          Not installed:
+        - if @install.size > 0
+          %b Not installed
           %br
           = render :partial => "check", :locals => {:mods => @install}
-        - if @special.size > 0
           %br
-          Special (Hover over modname to see why):
+        - if @special.size > 0
+          %b Special (Hover over modname to see why)
           %br
           = render :partial => "check", :locals => {:mods => @special}
-        - if @disabled.size > 0
           %br
-          Disabled:
+        - if @disabled.size > 0
+          %b Disabled
           %br
           = render :partial => "check", :locals => {:mods => @disabled}
+          %br

data/lib/six-updater-web/app/views/main/_servercheck.haml

@@ -8,12 +8,12 @@ Mods: #{@queryserver.mod}
 %br
 Allowed:
 %br
-= @allowed
+%div{:class => "green"}= @allowed
 %br
 %br
 Disallowed:
 %br
-= @disallowed
+%div{:class => "red"}= @disallowed
 %br
 %br
 Garbage:

data/lib/six-updater-web/app/views/main/index.haml

@@ -3,4 +3,7 @@
     %td{:valign => "top", :width => "40%"}
       = render :partial => "main/left"
     %td{:valign => "top", :width => "60%"}
-      =  render :partial => @server_check ? "main/servercheck" : "main/right"
+      - if @pm
+        = render :partial => "main/pm"
+      - else
+        = render :partial => @server_check ? "main/servercheck" : "main/right"

data/lib/six-updater-web/config/six-updater-web.rb

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.22.4"
+  VERSION = "0.23.0"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
@@ -134,9 +134,9 @@ module SixUpdaterWeb
 
   module_function
 
-  def update_gamespy
+  def update_gamespy(nogeo = nil)
     puts "Fetching server info..."
-    geo = ENV['NOGEO'] ? "" : nil
+    geo = ENV['NOGEO'] || nogeo ? "" : nil
     #geo = ""
     puts "Pings and Countries: #{geo.nil?}"
     puts ""

data/lib/six-updater-web/vendor/plugins/active_scaffold/lib/extensions/localize.rb

@@ -4,7 +4,7 @@ class Object
       # options[:default] ||= key.to_s.titleize unless ActiveScaffold::Config::Core.show_missing_translations
       # options[:default] = nil if ActiveScaffold::Config::Core.show_missing_translations
       # text = I18n.translate "#{key}", {:scope => [:active_scaffold]}.merge(options)
-      text = I18n.translate "#{key}", {:scope => [:active_scaffold], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)
+      text = I18n.translate "%{key}", {:scope => [:active_scaffold], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)
     end
     text
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 22
-  - 4
-  version: 0.22.4
+  - 23
+  - 0
+  version: 0.23.0
 platform: ruby
 authors: 
 - Sickboy
@@ -158,6 +158,8 @@ files:
 - lib/six-updater-web/app/models/action.rb
 - lib/six-updater-web/app/models/appsetting.rb
 - lib/six-updater-web/app/models/arma2_appsetting.rb
+- lib/six-updater-web/app/models/arma2_ca_appsetting.rb
+- lib/six-updater-web/app/models/arma2_ca_mod.rb
 - lib/six-updater-web/app/models/arma2_mod.rb
 - lib/six-updater-web/app/models/arma2_oa_appsetting.rb
 - lib/six-updater-web/app/models/arma2_oa_co_appsetting.rb
@@ -198,6 +200,7 @@ files:
 - lib/six-updater-web/app/views/main/wave.haml
 - lib/six-updater-web/app/views/main/_check.haml
 - lib/six-updater-web/app/views/main/_left.haml
+- lib/six-updater-web/app/views/main/_pm.haml
 - lib/six-updater-web/app/views/main/_right.haml
 - lib/six-updater-web/app/views/main/_servercheck.haml
 - lib/six-updater-web/app/views/main/_test.haml