fix security issue

[selectricity-live] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 8f1ccb893a2cd4338b5da98387c05cf3bf0aeaf3..bd11174757fe141495bea3eb1510dea37d458626 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,3 +1,10 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+
 require 'date'
 class GraphController < ApplicationController  
   class GruffGraff
@@ -113,7 +120,9 @@ class GraphController < ApplicationController
     data, labels = get_borda_points(@election.borda_result)
     
     size = "400x300"
-    size = "580x300" if @election.candidates.size >= 5
+    #size = "580x300" if @election.candidates.size >= 5
+    size = sprintf "580x%d", @election.candidates.size*22 \
+      if @election.candidates.size >= 5
     
    if @election.candidates.size >= 5
      marker_font_size = 17
@@ -121,7 +130,7 @@ class GraphController < ApplicationController
      marker_font_size = 20
    end
     
-    graph = GruffGraff.new( :graph_type => Gruff::Bar,
+    graph = GruffGraff.new( :graph_type => Gruff::SideBar,
                             :data_name => @election.name,
                             :data => data,
                             :interval_labels => labels,
@@ -129,8 +138,8 @@ class GraphController < ApplicationController
                             :title => "Points Per Candidate",
                             :marker_color => '#999999',
                             :marker_font_size => marker_font_size,
-                            :y_axis_label => "Points",
-                            :x_axis_label => "Candidates")
+                            :x_axis_label => "Points",
+                            :y_axis_label => "Candidates")
     send_data(*graph.output)
   end
   #Acording to Tufte, small, concomparitive, highly labeled data sets usually