diff options
| -rwxr-xr-x | config_poll.rb | 8 | ||||
| -rw-r--r-- | poll.rb | 101 |
2 files changed, 60 insertions, 49 deletions
diff --git a/config_poll.rb b/config_poll.rb index 563816b..e16f9ef 100755 --- a/config_poll.rb +++ b/config_poll.rb @@ -69,7 +69,7 @@ else <Files ~ "^(config|remove).cgi$"> AuthType digest AuthName "admin" - AuthUserFile #{File.expand_path(".")}/.htdigest + AuthUserFile "#{File.expand_path(".").gsub('"','\\\\"')}/.htdigest" Require valid-user </Files> HTACCESS @@ -78,7 +78,7 @@ HTACCESS htaccess << <<HTACCESS AuthType digest AuthName "participant" -AuthUserFile #{File.expand_path(".")}/.htdigest +AuthUserFile "#{File.expand_path(".").gsub('"','\\\\"')}/.htdigest" Require valid-user HTACCESS VCS.commit("Access Control changed") @@ -135,7 +135,7 @@ HTMLHEAD $htmlout += <<TABLE <div id='main'> <h1>#{table.name}</h1> -#{table.to_html("",true,$cgi["editcolumn"])} +#{table.to_html($cgi["edituser"],true,$cgi["editcolumn"])} TABLE $htmlout += <<INVITEDELETE @@ -221,7 +221,7 @@ $htmlout += "</div></body>" $htmlout += "</html>" -$header["Cache-Control"] => "no-cache" +$header["Cache-Control"] = "no-cache" $cgi.out($header){$htmlout} end @@ -67,32 +67,36 @@ EDITDELETE ret += head_to_html(config, activecolumn) sort_data($cgi.include?("sort") ? $cgi.params["sort"] : ["timestamp"]).each{|participant,poll| - ret += "<tr class='participantrow'>\n" - ret += "<td class='name' #{edituser == participant ? "id='active'":""}>" - ret += participant - ret += " <sup><a href=\"?edituser=#{CGI.escapeHTML(CGI.escape(participant))}\" style='text-decoration: none' >#{EDIT}</a></sup>" unless config - ret += "</td>\n" - @head.sort.each{|columntitle,columndescription| - klasse = poll[columntitle] - case klasse - when nil - value = UNKNOWN - klasse = "undecided" - when YESVAL - value = YES - when NOVAL - value = NO - when MAYBEVAL - value = MAYBE - end - ret += "<td class='#{klasse}' title=\"#{CGI.escapeHTML(participant)}: #{CGI.escapeHTML(columntitle.to_s)}\">#{value}</td>\n" - } - ret += "<td class='date'>#{poll['timestamp'].strftime('%d.%m, %H:%M')}</td>" - ret += "</tr>\n" + if edituser == participant + ret += participate_to_html(edituser, config) + else + ret += "<tr class='participantrow'>\n" + ret += "<td class='name' #{edituser == participant ? "id='active'":""}>" + ret += participant + ret += " <sup><a href=\"?edituser=#{CGI.escapeHTML(CGI.escape(participant))}\" style='text-decoration: none' >#{EDIT}</a></sup>" + ret += "</td>\n" + @head.sort.each{|columntitle,columndescription| + klasse = poll[columntitle] + case klasse + when nil + value = UNKNOWN + klasse = "undecided" + when YESVAL + value = YES + when NOVAL + value = NO + when MAYBEVAL + value = MAYBE + end + ret += "<td class='#{klasse}' title=\"#{CGI.escapeHTML(participant)}: #{CGI.escapeHTML(columntitle.to_s)}\">#{value}</td>\n" + } + ret += "<td class='date'>#{poll['timestamp'].strftime('%d.%m, %H:%M')}</td>" + ret += "</tr>\n" + end } # PARTICIPATE - ret += participate_to_html(edituser) unless config + ret += participate_to_html(edituser, config) unless @data.keys.include?(edituser) # SUMMARY ret += "<tr id='summary'><td class='name'>total</td>\n" @@ -134,7 +138,7 @@ EDITDELETE ret += "</table>\n" ret end - def participate_to_html(edituser) + def participate_to_html(edituser, config) checked = {} if @data.include?(edituser) @head.each_key{|k| checked[k] = @data[edituser][k]} @@ -147,29 +151,36 @@ EDITDELETE <input size='16' type='text' name='add_participant' - value=\"#{edituser}\" - title='To change a line, add a new person with the same name!' />" + value=\"#{edituser}\"/>" ret += "</td>\n" - @head.sort.each{|columntitle,columndescription| - ret += "<td class='checkboxes'><table>" - [[YES, YESVAL],[NO, NOVAL],[MAYBE, MAYBEVAL]].each{|valhuman, valbinary| - ret += "<tr> - <td> - <input type='radio' - value='#{valbinary}' - id=\"add_participant_checked_#{CGI.escapeHTML(columntitle.to_s.gsub(" ","_").gsub("+","_"))}_#{valbinary}\" - name=\"add_participant_checked_#{CGI.escapeHTML(columntitle.to_s)}\" - title=\"#{CGI.escapeHTML(columntitle.to_s)}\" #{checked[columntitle] == valbinary ? "checked='checked'":""}/> - </td> - <td class='input-#{valbinary}'> - <label for=\"add_participant_checked_#{CGI.escapeHTML(columntitle.to_s.gsub(" ","_").gsub("+","_"))}_#{valbinary}\">#{valhuman}</label> - </td> - </tr>" + if config + else + @head.sort.each{|columntitle,columndescription| + ret += "<td class='checkboxes'><table>" + [[YES, YESVAL],[NO, NOVAL],[MAYBE, MAYBEVAL]].each{|valhuman, valbinary| + ret += "<tr> + <td> + <input type='radio' + value='#{valbinary}' + id=\"add_participant_checked_#{CGI.escapeHTML(columntitle.to_s.gsub(" ","_").gsub("+","_"))}_#{valbinary}\" + name=\"add_participant_checked_#{CGI.escapeHTML(columntitle.to_s)}\" + title=\"#{CGI.escapeHTML(columntitle.to_s)}\" #{checked[columntitle] == valbinary ? "checked='checked'":""}/> + </td> + <td class='input-#{valbinary}'> + <label for=\"add_participant_checked_#{CGI.escapeHTML(columntitle.to_s.gsub(" ","_").gsub("+","_"))}_#{valbinary}\">#{valhuman}</label> + </td> + </tr>" + } + ret += "</table></td>" } - ret += "</table></td>" - } - ret += "<td class='checkboxes'><input type='submit' value='add/edit' />" - ret += "<br /><input style='margin-top:1ex' type='submit' name='delete_participant' value='delete user' />" if @data.include?(edituser) + end + ret += "<td class='checkboxes'>" + if @data.include?(edituser) + ret += "<input type='submit' value='edit user' />" + ret += "<br /><input style='margin-top:1ex' type='submit' name='delete_participant' value='delete user' />" + else + ret += "<input type='submit' value='add user' />" + end ret += "</td>\n" ret += "</tr>\n" |