[freeside-commits] branch master updated. b3c70d709fd646ef355d49a4e87151c99ee413e9

[Ivan]

The branch, master has been updated
       via  b3c70d709fd646ef355d49a4e87151c99ee413e9 (commit)
       via  80f265ee8f2603f0e3f7f5ad6c6c0cf704f98cb8 (commit)
      from  59285fa7c07ac86914f3998f2635caf067c07506 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3c70d709fd646ef355d49a4e87151c99ee413e9
Merge: 80f265e 59285fa
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Nov 7 12:32:06 2015 -0800

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 80f265ee8f2603f0e3f7f5ad6c6c0cf704f98cb8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Nov 7 12:31:42 2015 -0800

    fix 404 cities.cgi / self-service dynamic addresses

diff --git a/FS/FS/ClientAPI/MasonComponent.pm b/FS/FS/ClientAPI/MasonComponent.pm
index 3c3bf4c..493e0c0 100644
--- a/FS/FS/ClientAPI/MasonComponent.pm
+++ b/FS/FS/ClientAPI/MasonComponent.pm
@@ -21,6 +21,7 @@ my %allowed_comps = map { $_=>1 } qw(
   /misc/phonenums.cgi
   /misc/states.cgi
   /misc/counties.cgi
+  /misc/cities.cgi
   /misc/svc_acct-domains.cgi
   /misc/part_svc-columns.cgi
   /edit/elements/svc_forward.html
diff --git a/fs_selfservice/FS-SelfService/cgi/misc/cities.cgi b/fs_selfservice/FS-SelfService/cgi/misc/cities.cgi
new file mode 100755
index 0000000..07753f3
--- /dev/null
+++ b/fs_selfservice/FS-SelfService/cgi/misc/cities.cgi
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -w
+
+use strict;
+use CGI;
+use FS::SelfService qw( mason_comp );
+
+my $cgi = new CGI;
+
+my $rv = mason_comp( 'comp'         => '/misc/cities.cgi',
+                     'query_string' => $cgi->query_string, #pass CGI params...
+                   );
+
+#hmm.
+my $output = $rv->{'error'} || $rv->{'output'};
+
+print $cgi->header( '-expires' => 'now' ).
+      $output;
+

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/ClientAPI/MasonComponent.pm                                 |    1 +
 fs_selfservice/FS-SelfService/cgi/misc/{states.cgi => cities.cgi} |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 copy fs_selfservice/FS-SelfService/cgi/misc/{states.cgi => cities.cgi} (84%)