Updated gems, footer, form_for usage - warvox - VoIP based wardialing tool, forked from rapid7/warvox.
DIR Log
DIR Files
DIR Refs
DIR README
---
DIR commit 5432867e7d8c11ff0cfbe34966ae4f8880a35b1f
DIR parent 5ea12e680a0a2f9184e6f4c23c39c927cb714b67
HTML Author: HD Moore <hd_moore@rapid7.com>
Date: Wed, 26 Dec 2012 14:17:01 -0600
Updated gems, footer, form_for usage
Diffstat:
M web/Gemfile.lock | 28 +++++++++++++++-------------
M web/app/controllers/dial_jobs_cont… | 30 +++++++++++++++---------------
M web/app/controllers/providers_cont… | 2 +-
M web/app/models/dial_job.rb | 12 +++++++-----
M web/app/models/provider.rb | 4 +++-
M web/app/views/dial_jobs/edit.html.… | 2 +-
M web/app/views/dial_jobs/new.html.e… | 12 ++++++------
M web/app/views/dial_results/edit.ht… | 4 ++--
M web/app/views/dial_results/new.htm… | 2 +-
M web/app/views/layouts/warvox.html.… | 11 +++++++----
M web/app/views/providers/edit.html.… | 2 +-
M web/app/views/providers/index.html… | 9 ++++-----
M web/app/views/providers/new.html.e… | 2 +-
M web/app/views/shared/_footer.html.… | 6 +++---
14 files changed, 67 insertions(+), 59 deletions(-)
---
DIR diff --git a/web/Gemfile.lock b/web/Gemfile.lock
@@ -29,14 +29,14 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
- builder (3.0.3)
+ builder (3.0.4)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.4.0)
dynamic_form (1.1.4)
erubis (2.7.0)
execjs (1.4.0)
@@ -44,18 +44,18 @@ GEM
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
json (1.7.5)
kissfft (0.0.1)
- libv8 (3.3.10.4)
+ librex (0.0.68)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- multi_json (1.3.6)
+ multi_json (1.5.0)
pg (0.11.0)
polyglot (0.3.3)
rack (1.4.1)
@@ -80,10 +80,11 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
- sass (3.2.1)
+ ref (1.0.2)
+ sass (3.2.4)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -92,14 +93,14 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.10.1)
- libv8 (~> 3.3.10)
+ therubyracer (0.11.0)
+ ref
thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.11)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -113,6 +114,7 @@ DEPENDENCIES
dynamic_form
jquery-rails
kissfft
+ librex
pg (= 0.11)
rails (= 3.2.8)
sass-rails (~> 3.2.3)
DIR diff --git a/web/app/controllers/dial_jobs_controller.rb b/web/app/controllers/dial_jobs_controller.rb
@@ -1,6 +1,6 @@
class DialJobsController < ApplicationController
layout 'warvox'
-
+
# GET /dial_jobs
# GET /dial_jobs.xml
def index
@@ -29,12 +29,12 @@ class DialJobsController < ApplicationController
@dial_job = DialJob.find(params[:id])
end
=end
-
+
# GET /dial_jobs/1/run
def run
@dial_job = DialJob.find(params[:id])
-
+
if(@dial_job.status != 'submitted')
flash[:notice] = 'Job is already running or completed'
return
@@ -43,25 +43,25 @@ class DialJobsController < ApplicationController
WarVOX::JobManager.schedule(::WarVOX::Jobs::Dialer, @dial_job.id)
redirect_to :action => 'index'
end
-
+
def stop
@dial_job = DialJob.find(params[:id])
if(@dial_job.status != 'submitted')
flash[:notice] = 'Job is already running or completed'
return
- end
+ end
end
-
-
+
+
# POST /dial_jobs
# POST /dial_jobs.xml
def create
-
+
@dial_job = DialJob.new(params[:dial_job])
-
+
if(Provider.find_all_by_enabled(true).length == 0)
- @dial_job.errors.add("No providers have been configured or enabled, this job cannot be run")
+ @dial_job.errors.add(:base, "No providers have been configured or enabled, this job cannot be run")
respond_to do |format|
format.html { render :action => "new" }
format.xml { render :xml => @dial_job.errors, :status => :unprocessable_entity }
@@ -83,10 +83,10 @@ class DialJobsController < ApplicationController
respond_to do |format|
if @dial_job.save
flash[:notice] = 'Job was successfully created.'
-
- # Launch it
+
+ # Launch it
WarVOX::JobManager.schedule(::WarVOX::Jobs::Dialer, @dial_job.id)
-
+
format.html { redirect_to(@dial_job) }
format.xml { render :xml => @dial_job, :status => :created, :location => @dial_job }
else
@@ -107,7 +107,7 @@ class DialJobsController < ApplicationController
format.xml { head :ok }
end
end
-
+
# GET /dial_jobs/1
# GET /dial_jobs/1.xml
def show
@@ -119,5 +119,5 @@ class DialJobsController < ApplicationController
end
end
-
+
end
DIR diff --git a/web/app/controllers/providers_controller.rb b/web/app/controllers/providers_controller.rb
@@ -7,7 +7,7 @@ class ProvidersController < ApplicationController
@providers = Provider.find(:all)
@new_provider = Provider.new
@new_provider.enabled = true
-
+
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @providers }
DIR diff --git a/web/app/models/dial_job.rb b/web/app/models/dial_job.rb
@@ -1,6 +1,6 @@
class DialJob < ActiveRecord::Base
attr_accessor :range_file
-
+
has_many :dial_results
validates_presence_of :range, :lines, :seconds
@@ -14,17 +14,19 @@ class DialJob < ActiveRecord::Base
if(range.gsub(/[^0-9X:,\n]/, '').empty?)
errors.add(:range, "must be at least 1 character long and made up of 0-9 and X as the mask.")
end
-
+
if(range.scan(/X/).length > 5)
errors.add(:range, "must contain no more than 5 mask digits.")
end
-
+
if(cid_mask != "SELF" and cid_mask.gsub(/[^0-9X]/, '').empty?)
errors.add(:range, "The Caller ID must be at least 1 character long and made up of 0-9 and X as the mask.")
end
-
+
if(cid_mask != "SELF" and cid_mask.scan(/X/).length > 5)
errors.add(:range, "The Caller ID must contain no more than 5 mask digits.")
- end
+ end
end
+
+ attr_accessible :range, :seconds, :lines, :cid_mask
end
DIR diff --git a/web/app/models/provider.rb b/web/app/models/provider.rb
@@ -1,7 +1,9 @@
class Provider < ActiveRecord::Base
has_many :dial_results
-
+
validates_presence_of :name, :host, :port, :user, :pass, :lines
validates_numericality_of :port, :less_than => 65536, :greater_than => 0
validates_numericality_of :lines, :less_than => 255, :greater_than => 0
+
+ attr_accessible :name, :host, :port, :user, :pass, :lines
end
DIR diff --git a/web/app/views/dial_jobs/edit.html.erb b/web/app/views/dial_jobs/edit.html.erb
@@ -1,6 +1,6 @@
<h1 class='title'>Modify Job</h1>
-<% form_for(@dial_job) do |f| %>
+<%= form_for(@dial_job) do |f| %>
<%= f.error_messages %>
<p>
DIR diff --git a/web/app/views/dial_jobs/new.html.erb b/web/app/views/dial_jobs/new.html.erb
@@ -1,32 +1,32 @@
<h1 class='title'>Submit a New Job</h1>
-<% form_for(@dial_job, :html => { :multipart => true }) do |f| %>
+<%= form_for(@dial_job, :html => { :multipart => true }) do |f| %>
<%= f.error_messages %>
<p>
<%= f.label :range, 'Specify target telephone range(s) (1-123-456-7890 or 1-123-456-XXXX or 1-123-300-1000:1-123-400-2000)' %><br />
<%= f.text_area :range, :size => "35x5" %>
</p>
-
+
<p>
<%= f.label :range_file, 'Or upload a file containing the target ranges' %><br />
<%= f.file_field :range_file %>
</p>
-
+
<p>
<%= f.label :seconds, 'Seconds of audio to capture' %><br />
<%= f.text_field :seconds, :value => 53 %>
</p>
-
+
<p>
<%= f.label :lines, 'Maximum number of outgoing lines' %><br />
<%= f.text_field :lines, :value => 10 %>
</p>
-
+
<p>
<%= f.label :lines, 'The source Caller ID range (1-555-555-55XX or SELF)' %><br />
<%= f.text_field :cid_mask, :value => '1-123-456-XXXX' %>
</p>
-
+
<p>
<%= f.submit "Create" %>
</p>
DIR diff --git a/web/app/views/dial_results/edit.html.erb b/web/app/views/dial_results/edit.html.erb
@@ -1,6 +1,6 @@
<h1>Editing dial_result</h1>
-<% form_for(@dial_result) do |f| %>
+<%= form_for(@dial_result) do |f| %>
<%= f.error_messages %>
<p>
@@ -10,7 +10,7 @@
<p>
<%= f.label :cid %><br />
<%= f.text_field :cid %>
- </p>
+ </p>
<p>
<%= f.label :dial_job_id %><br />
<%= f.text_field :dial_job_id %>
DIR diff --git a/web/app/views/dial_results/new.html.erb b/web/app/views/dial_results/new.html.erb
@@ -1,6 +1,6 @@
<h1>New dial_result</h1>
-<% form_for(@dial_result) do |f| %>
+<%= form_for(@dial_result) do |f| %>
<%= f.error_messages %>
<p>
DIR diff --git a/web/app/views/layouts/warvox.html.erb b/web/app/views/layouts/warvox.html.erb
@@ -4,8 +4,8 @@
<title><%= @title || "WarVOX" %></title>
<%= csrf_meta_tag %>
<%= stylesheet_link_tag 'global' %>
- <!--[if IE 7]><%= stylesheet_link_tag 'ie7' %><![endif]-->
- <%= javascript_include_tag 'jquery' %>
+ <!--[if IE 7]><%= stylesheet_link_tag 'ie7' %><![endif]-->
+ <%= javascript_include_tag 'jquery' %>
</head>
<body>
@@ -17,13 +17,16 @@
<div class="box_full">
<img src="<%= asset_path('round_top.png') %>" id="round_top" alt=""/>
<div id="main">
+
+ <div id="flash"></div>
+
<%= yield %>
<br/><br/>
-
+
<div id="footer">
<%= render :partial => 'shared/footer' %>
</div>
-
+
</div>
<img src="<%= asset_path('round_bot.png') %>" id="round_bot" alt=""/>
</div>
DIR diff --git a/web/app/views/providers/edit.html.erb b/web/app/views/providers/edit.html.erb
@@ -1,6 +1,6 @@
<h1 class='title'>Edit Provider</h1>
-<% form_for(@provider) do |f| %>
+<%= form_for(@provider) do |f| %>
<%= f.error_messages %>
<p>
<%= f.label :enabled %><br />
DIR diff --git a/web/app/views/providers/index.html.erb b/web/app/views/providers/index.html.erb
@@ -2,7 +2,7 @@
<h1 class='title'>Providers</h1>
<table class='table_scaffold' width='100%'>
<tr>
- <th>Enabled</th>
+ <th>Enabled</th>
<th>Name</th>
<th>Host</th>
<th>Port</th>
@@ -13,7 +13,7 @@
<% for provider in @providers %>
<tr>
- <td><%=h provider.enabled %></td>
+ <td><%=h provider.enabled %></td>
<td><%=h provider.name %></td>
<td><%=h provider.host %></td>
<td><%=h provider.port %></td>
@@ -35,9 +35,9 @@
<h1 class='title'>No Configured Providers</h1>
<br/>
-<h1 class='title'>New Provider</h1>
+<h1 class='title'>Configure a New Provider</h1>
-<% form_for(@new_provider) do |f| %>
+<%= form_for(@new_provider) do |f| %>
<%= f.error_messages %>
<p>
<%= f.label :name, 'The nickname for this provider' %><br />
@@ -69,4 +69,3 @@
<% end %>
<% end %>
-
DIR diff --git a/web/app/views/providers/new.html.erb b/web/app/views/providers/new.html.erb
@@ -1,6 +1,6 @@
<h1 class='title'>New Provider</h1>
-<% form_for(@provider) do |f| %>
+<%= form_for(@provider) do |f| %>
<%= f.error_messages %>
<p>
<%= f.label :name, 'The nickname for this provider' %><br />
DIR diff --git a/web/app/views/shared/_footer.html.erb b/web/app/views/shared/_footer.html.erb
@@ -1,5 +1,5 @@
<div id="footer">
- <div id='copyright'>
- Copyright ©2009-2011 Rapid7 LLC<br/>
- </div>
+ <div id='copyright'>
+ Copyright ©2009-2013 Rapid7, Inc.<br/>
+ </div>
</div>