aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Save the latest translations from Transifex on a hotfix branchhotfix/0.14.0.4Mark Longair2013-11-08-15399/+35722
| | | | | | | | As suggested in the release manager's checklist, this is to preserve the updated translations against the old set of msgids. Note that there were some problems with locale/cy/app.po which I've fixed on the rails-3-develop branch, but I haven't added those fixes here.
* Monkey patch actionmailer for CVE-2013-43890.14.0.3hotfix/0.14.0.3Louise Crow2013-10-24-0/+16
| | | | http://seclists.org/oss-sec/2013/q4/118
* Add factory to support new specs.0.14.0.2hotfix/0.14.0.2Louise Crow2013-10-03-0/+7
|
* Don't allow redirects to another host.Louise Crow2013-10-02-1/+35
|
* Handle salutations with regexp special characters.0.14.0.1Louise Crow2013-09-30-1/+11
| | | | Fixes #1104.
* Merge branch 'release/0.14'0.14Louise Crow2013-09-24-11558/+8513
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/bg/app.po locale/fr/app.po locale/fr_CA/app.po locale/he_IL/app.po locale/hr/app.po locale/it/app.po locale/nb_NO/app.po locale/pl/app.po locale/sv/app.po locale/vi/app.po
| * Fix typorelease/0.14Louise Crow2013-09-24-1/+1
| |
| * Bump Alaveteli versionLouise Crow2013-09-24-1/+1
| |
| * Latest translations from Transifex.Louise Crow2013-09-24-51/+51
| |
| * Revert "No need to set permissions on file now."Louise Crow-1042/+2960
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile app/views/admin_request/edit_outgoing.html.erb config/packages doc/CHANGES.md doc/INSTALL.md spec/models/info_request_spec.rb spec/models/public_body_spec.rb
| | * | Add note about possible errors on rubygems upgrade.Louise Crow2013-09-16-1/+1
| | | |
| | * | Assume Ubuntu 12.04 (precise) not 10.04 (lucid)Louise Crow2013-09-16-2/+3
| | | | | | | | | | | | | | | | | | | | Precise is now the long term maintenance version, and has a more up-to-date package of rubygems available.
| | * | Specify a later version of rubygemsLouise Crow2013-09-16-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 1.8.15 from backports should not have the Syck bug described here: http://stackoverflow.com/questions/9004804/invalid-gemspec-illformed-requirement-yamlsyckdefaultkey0xb5f9c990-3 http://blog.rubygems.org/2011/08/31/shaving-the-yaml-yak.html
| | * | Use 403, not 410, for hidden items.Louise Crow2013-09-16-9/+9
| | | | | | | | | | | | | | | | | | | | As @mhl points out, this more clearly indicates that they may come back at some point.
| | * | Add some upgrade notes.Louise Crow2013-09-16-0/+23
| | | |
| | * | No need to set permissions on file now.Louise Crow2013-09-16-1/+0
| | | | | | | | | | | | | | | | | | | | Either rails or the webserver will be sending it, we're not redirecting anymore.
| | * | Add message index to attachment filesLouise Crow2013-09-16-4/+6
| | | | | | | | | | | | | | | | | | | | So that files attached to different messages with the same name and url_part don't get overwritten.
| | * | Make test ruby 1.8.7 compatible.Louise Crow2013-09-16-1/+1
| | | |
| | * | Use earlier factory_girl syntaxLouise Crow2013-09-16-26/+33
| | | |
| | * | Downgrade factory_girl for ruby 1.8.7Louise Crow2013-09-16-6/+6
| | | | | | | | | | | | | | | | Versions of factory_girl after 3 are not compatible with ruby 1.8.7
| | * | Point admin link to incoming message admin interface.Louise Crow2013-09-16-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add the 'Actions' to the incoming message admin - now that this has both this and the prominence form, it seems like the logical place to link to from the main request page.
| | * | Exclude hidden responses when calculating old_unclassifiedLouise Crow2013-09-16-15/+33
| | | | | | | | | | | | | | | | | | | | Make old_unclassified_params method consistent with last_public_response_event and associated methods.
| | * | Only include public messages in who_can_followup_toLouise Crow2013-09-16-1/+59
| | | |
| | * | Add public criteria for message event access methodsLouise Crow2013-09-16-83/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | get_last_response_event and get_last_outgoing_event are used in various places to determine which events to link to, use in queries etc. Restrict them to refer to the last publicly visible event of the relevant type, and rename them to make that clear.
| | * | Shorter way of getting text template.Louise Crow2013-09-16-1/+1
| | | |
| | * | Hide hidden outgoing messages in download.Louise Crow2013-09-16-10/+112
| | | |
| | * | Fix spec descriptionsLouise Crow2013-09-16-2/+2
| | | |
| | * | Add prominence fields and cache expiry to outgoing adminLouise Crow2013-09-16-20/+131
| | | |
| | * | InfoRequestEvent.indexed_by_search consults OutgoingMessage.Louise Crow2013-09-16-1/+21
| | | |
| | * | Move indexed_by_search to MessageProminenceLouise Crow2013-09-16-6/+27
| | | | | | | | | | | | | | | | Add some tests that it's working on the outgoing message model.
| | * | Add some tests for user_can_view? on outgoing message.Louise Crow2013-09-16-0/+52
| | | |
| | * | Add hidden messages for outgoing message.Louise Crow2013-09-16-32/+79
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/request/_incoming_correspondence.html.erb
| | * | Create MessageProminence module.Louise Crow2013-09-16-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | At least some of the logic for incoming and outgoing message prominence is going to be identical, so move it to a module they can both include and use.
| | * | Allow creation of multiple public bodies in one test.Louise Crow2013-09-16-2/+4
| | | | | | | | | | | | | | | | | | | | Add some sequences to make sure that we don't get validation errors on unique fields.
| | * | Convert specs to factories from fixtures.Louise Crow2013-09-16-52/+48
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: spec/integration/view_request_spec.rb
| | * | Add prominence fields to outgoing message.Louise Crow2013-09-16-0/+6
| | | |
| | * | Add a test of incoming message hiding with PDF conversionLouise Crow2013-09-16-0/+59
| | | |
| | * | Don't make zip dir publicly accessible.Louise Crow2013-09-16-7/+0
| | | | | | | | | | | | | | | | We want to be able to authorise access to it.
| | * | Clean up the test download dir after use.Louise Crow2013-09-16-0/+4
| | | |
| | * | Move some download methods to InfoRequest.Louise Crow2013-09-16-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | Use send_file to send zips. Also adds 'all_can_view_all_correspondence?' - is this request completely cachable, or do we need to cache different versions for different levels of privilege?
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-27 01:12:45 +0000
>user->phone; $params->{email} = $problem->user->email if $problem->user->email; # Some endpoints don't follow the Open311 spec correctly and require an # email address for service requests. if ($self->always_send_email && !$params->{email}) { $params->{email} = FixMyStreet->config('DO_NOT_REPLY_EMAIL'); } # if you click nearby reports > skip map then it's possible # to end up with used_map = f and nothing in postcode if ( $problem->used_map || $self->always_send_latlong || ( !$self->send_notpinpointed && !$problem->used_map && !$problem->postcode ) ) { $params->{lat} = Utils::truncate_coordinate($problem->latitude); $params->{long} = Utils::truncate_coordinate($problem->longitude); # this is a special case for sending to Bromley so they can # report accuracy levels correctly. We include easting and # northing as attributes elsewhere. } elsif ( $self->send_notpinpointed && !$problem->used_map && !$problem->postcode ) { $params->{address_id} = '#NOTPINPOINTED#'; } else { $params->{address_string} = $problem->postcode; } if ( $extra->{image_url} ) { if ( $self->multi_photos ) { $params->{media_url} = $extra->{all_image_urls}; } else { $params->{media_url} = $extra->{image_url}; } } if ( $self->use_service_as_deviceid && $problem->service ) { $params->{deviceid} = $problem->service; } for my $attr ( @{$problem->get_extra_fields} ) { my $attr_name = $attr->{name}; if ( $attr_name eq 'first_name' || $attr_name eq 'last_name' ) { $params->{$attr_name} = $attr->{value} if $attr->{value}; next if $attr_name eq 'first_name'; } $attr_name =~ s/fms_extra_//; my $name = sprintf( 'attribute[%s]', $attr_name ); $params->{ $name } = $attr->{value}; } return $params; } sub _generate_service_request_description { my $self = shift; my $problem = shift; my $extra = shift; my $description = ""; if ($extra->{easting}) { # Proxy for cobrand being in the UK $description .= "detail: " . $problem->detail . "\n\n"; $description .= "url: " . $extra->{url} . "\n\n"; $description .= "Submitted via FixMyStreet\n"; $description = "title: " . $problem->title . "\n\n$description"; } elsif ($problem->cobrand eq 'fixamingata') { $description .= "Titel: " . $problem->title . "\n\n"; $description .= "Beskrivning: " . $problem->detail . "\n\n"; $description .= "Länk till ärendet: " . $extra->{url} . "\n\n"; $description .= "Skickad via FixaMinGata\n"; } else { $description .= $problem->title . "\n\n"; $description .= $problem->detail . "\n\n"; $description .= $extra->{url} . "\n"; } return $description; } sub get_service_requests { my $self = shift; my $args = shift; my $params = {}; if ( $args->{report_ids} ) { $params->{service_request_id} = join ',', @{$args->{report_ids}}; delete $args->{report_ids}; } $params = { %$params, %$args }; my $service_request_xml = $self->_get( $self->endpoints->{requests}, $params || undef ); return $self->_get_xml_object( $service_request_xml ); } sub get_service_request_id_from_token { my $self = shift; my $token = shift; my $service_token_xml = $self->_get( "tokens/$token.xml" ); my $obj = $self->_get_xml_object( $service_token_xml ); if ( $obj && $obj->{request}->[0]->{service_request_id} ) { return $obj->{request}->[0]->{service_request_id}; } else { return 0; } } sub get_service_request_updates { my $self = shift; my $start_date = shift; my $end_date = shift; my $params = { api_key => $self->api_key || '', }; if ( $start_date || $end_date ) { return 0 unless $start_date && $end_date; $params->{start_date} = $start_date; $params->{end_date} = $end_date; } my $xml = $self->_get( $self->endpoints->{service_request_updates}, $params || undef ); my $service_requests = $self->_get_xml_object( $xml ); return $service_requests->{request_update}; } sub post_service_request_update { my $self = shift; my $comment = shift; my $params = $self->_populate_service_request_update_params( $comment ); my $response = $self->_post( $self->endpoints->{update}, $params ); if ( $response ) { my $obj = $self->_get_xml_object( $response ); if ( $obj ) { if ( my $update_id = $obj->{request_update}->[0]->{update_id} ) { return $update_id unless ref $update_id; } else { if ( my $token = $obj->{request_update}->[0]->{token} ) { return $self->get_service_request_id_from_token( $token ); } } } warn sprintf( "Failed to submit comment %s over Open311, response - %s\n%s\n", $comment->id, $response, $self->debug_details ) if warn_failure($comment, $comment->problem); } else { warn sprintf( "Failed to submit comment %s over Open311, details\n%s\n", $comment->id, $self->error) if warn_failure($comment, $comment->problem); } return 0; } sub add_media { my ($self, $url, $object) = @_; my $ua = LWP::UserAgent->new; my $res = $ua->get($url); if ( $res->is_success && $res->content_type eq 'image/jpeg' ) { my $photoset = FixMyStreet::App::Model::PhotoSet->new({ data_items => [ $res->decoded_content ], }); $object->photo($photoset->data); } } sub map_state { my $self = shift; my $incoming_state = shift; $incoming_state = lc($incoming_state); $incoming_state =~ s/_/ /g; my %state_map = ( fixed => 'fixed - council', 'not councils responsibility' => 'not responsible', 'no further action' => 'unable to fix', open => 'confirmed', closed => $self->extended_statuses ? 'closed' : 'fixed - council', ); return $state_map{$incoming_state} || $incoming_state; } sub _populate_service_request_update_params { my $self = shift; my $comment = shift; my $name = $comment->name || $comment->user->name; my ( $firstname, $lastname ) = $self->split_name( $name ); $lastname ||= '-'; # fall back to problem state as it's probably correct my $state = $comment->problem_state || $comment->problem->state; my $status = 'OPEN'; if ( $self->extended_statuses ) { if ( FixMyStreet::DB::Result::Problem->fixed_states()->{$state} ) { $status = 'FIXED'; } elsif ( $state eq 'in progress' ) { $status = 'IN_PROGRESS'; } elsif ($state eq 'action scheduled' || $state eq 'planned' ) { $status = 'ACTION_SCHEDULED'; } elsif ( $state eq 'investigating' ) { $status = 'INVESTIGATING'; } elsif ( $state eq 'duplicate' ) { $status = 'DUPLICATE'; } elsif ( $state eq 'not responsible' ) { $status = 'NOT_COUNCILS_RESPONSIBILITY'; } elsif ( $state eq 'unable to fix' ) { $status = 'NO_FURTHER_ACTION'; } elsif ( $state eq 'internal referral' ) { $status = 'INTERNAL_REFERRAL'; } elsif ($comment->mark_open && $self->mark_reopen) { $status = 'REOPEN'; } } else { if ( !FixMyStreet::DB::Result::Problem->open_states()->{$state} ) { $status = 'CLOSED'; } } my $service_request_id = $comment->problem->external_id; if ( $self->use_customer_reference ) { $service_request_id = $comment->problem->get_extra_metadata('customer_reference'); } my $params = { updated_datetime => DateTime::Format::W3CDTF->format_datetime($comment->confirmed->set_nanosecond(0)), service_request_id => $service_request_id, status => $status, description => $comment->text, last_name => $lastname, first_name => $firstname, }; $params->{phone} = $comment->user->phone if $comment->user->phone; $params->{email} = $comment->user->email if $comment->user->email; $params->{update_id} = $comment->id; my $cobrand = $self->fixmystreet_body->get_cobrand_handler || $comment->get_cobrand_logged; $cobrand->call_hook(open311_munge_update_params => $params, $comment, $self->fixmystreet_body); if ( $comment->photo ) { my $cobrand = $comment->get_cobrand_logged; my $email_base_url = $cobrand->base_url($comment->cobrand_data); my $url = $email_base_url . $comment->photos->[0]->{url_full}; $params->{media_url} = $url; } # The following will only set by UK in Bromley/Bromley cobrands if ( $comment->extra && $comment->extra->{title} ) { $params->{'email_alerts_requested'} = $comment->extra->{email_alerts_requested} ? 'TRUE' : 'FALSE'; $params->{'title'} = $comment->extra->{title}; $params->{first_name} = $comment->extra->{first_name} if $comment->extra->{first_name}; $params->{last_name} = $comment->extra->{last_name} if $comment->extra->{last_name}; } return $params; } sub split_name { my ( $self, $name ) = @_; return ('', '') unless $name; my ( $first, $last ) = ( $name =~ /(\w+)(?:\.?\s+(.+))?/ ); return ( $first || '', $last || ''); } sub _params_to_string { my( $self, $params, $request_string ) = @_; my $undefined; my $string = join("\n", map { $undefined .= "$_ undefined\n" unless defined $params->{$_}; "$_: " . ( $params->{$_} // '' ); } keys %$params); warn "$request_string $undefined $string" if $undefined; return $string; } sub _request { my $self = shift; my $method = shift; my $path = shift; my $params = shift || {}; my $uri = URI->new( $self->endpoint ); $uri->path( $uri->path . $path ); $params->{jurisdiction_id} = $self->jurisdiction if $self->jurisdiction; $params->{api_key} = ($self->api_key || '') if $method eq 'POST' && $self->api_key; my $debug_request = $method . ' ' . $uri->as_string . "\n\n"; my $req = do { if ($method eq 'GET') { $uri->query_form( $params ); GET $uri->as_string; } elsif ($method eq 'POST') { POST $uri->as_string, $params; } }; $debug_request .= $self->_params_to_string($params, $debug_request); $self->debug_details( $self->debug_details . $debug_request ); if ( $self->test_mode && $req->method eq 'GET') { $self->success(1); $self->test_uri_used( $uri->as_string ); return $self->test_get_returns->{ $path }; } my $res = do { if ( $self->test_mode ) { $self->test_req_used( $req ); $self->test_get_returns->{ $path }; } else { my $ua = LWP::UserAgent->new; $ua->request( $req ); } }; if ( $res->is_success ) { $self->success(1); return $res->decoded_content; } else { $self->success(0); $self->error( sprintf( "request failed: %s\nerror: %s\n%s\n", $res->status_line, $self->_process_error( $res->decoded_content ), $self->debug_details ) ); return; } } sub _get { my $self = shift; return $self->_request(GET => @_); } sub _post { my $self = shift; return $self->_request(POST => @_); } sub _process_error { my $self = shift; my $error = shift; my $obj = $self->_get_xml_object( $error ); my $msg = ''; if ( ref $obj && exists $obj->{error} ) { for (@{ $obj->{error} }) { my $code = $_->{code} || '???'; my $desc = $_->{description} || 'unknown error'; $msg .= sprintf("%s: %s\n", $code, $desc); } } return $msg || 'unknown error'; } sub _get_xml_object { my ($self, $xml) = @_; # Of these, services/service_requests/service_request_updates are root # elements, so GroupTags has no effect, but this is used in ForceArray too. my $group_tags = { services => 'service', attributes => 'attribute', values => 'value', service_requests => 'request', errors => 'error', service_request_updates => 'request_update', }; my $simple = XML::Simple->new( ForceArray => [ values %$group_tags ], KeyAttr => {}, GroupTags => $group_tags, SuppressEmpty => undef, ); my $obj = eval { $simple->parse_string($xml); }; return $obj; } 1;