@@ -4,21 +4,319 @@ // Options: 'list' or 'current' appconf_set ('show', 'current'); +appconf_set ('default_country', 'ca'); + appconf_set ('provinces', array ( '' => '- SELECT -', - 'AB' => 'Alberta', - 'BC' => 'British Columbia', - 'MB' => 'Manitoba', - 'NB' => 'New Brunswick', - 'NF' => 'Newfoundland/Labrador', - 'NS' => 'Nova Scotia', - 'NV' => 'Nunavut', - 'NT' => 'Northwest Territories', - 'ON' => 'Ontario', - 'PE' => 'Prince Edward Island', - 'QC' => 'Quebec', - 'SK' => 'Saskatchewan', - 'YK' => 'Yukon Territory', + 'al' => 'Alabama', + 'ak' => 'Alaska', + 'ab' => 'Alberta', + 'az' => 'Arizona', + 'ar' => 'Arkansas', + 'bc' => 'British Columbia', + 'ca' => 'California', + 'co' => 'Colorado', + 'ct' => 'Connecticut', + 'dc' => 'District of Columbia', + 'de' => 'Delaware', + 'fl' => 'Florida', + 'ga' => 'Georgia', + 'hi' => 'Hawaii', + 'id' => 'Idaho', + 'il' => 'Illinois', + 'in' => 'Indiana', + 'ia' => 'Iowa', + 'ks' => 'Kansas', + 'ky' => 'Kentucky', + 'la' => 'Louisiana', + 'me' => 'Maine', + 'mb' => 'Manitoba', + 'md' => 'Maryland', + 'ma' => 'Massachusetts', + 'mi' => 'Michigan', + 'mn' => 'Minnesota', + 'ms' => 'Mississippi', + 'mo' => 'Missouri', + 'mt' => 'Montana', + 'ne' => 'Nebraska', + 'nv' => 'Nevada', + 'nb' => 'New Brunswick', + 'nh' => 'New Hampshire', + 'nj' => 'New Jersey', + 'nm' => 'New Mexico', + 'ny' => 'New York', + 'nl' => 'Newfoundland and Labrador', + 'nc' => 'North Carolina', + 'nd' => 'North Dakota', + 'nt' => 'Northwest Territories', + 'ns' => 'Nova Scotia', + 'nu' => 'Nunavut', + 'oh' => 'Ohio', + 'ok' => 'Oklahoma', + 'on' => 'Ontario', + 'or' => 'Oregon', + 'pa' => 'Pennsylvania', + 'pe' => 'Prince Edward Island', + 'qc' => 'Quebec', + 'ri' => 'Rhode Island', + 'sk' => 'Saskatchewan', + 'sc' => 'South Carolina', + 'sd' => 'South Dakota', + 'tn' => 'Tennessee', + 'tx' => 'Texas', + 'ut' => 'Utah', + 'vt' => 'Vermont', + 'va' => 'Virginia', + 'wa' => 'Washington', + 'wv' => 'West Virginia', + 'wi' => 'Wisconsin', + 'wy' => 'Wyoming', + 'yt' => 'Yukon', + '--' => 'Other/Not Listed', +)); + +appconf_set ('countries', array ( + '' => '- SELECT -', + 'ca' => 'Canada', + 'us' => 'United States', + 'af' => 'Afghanistan', + 'al' => 'Albania', + 'dz' => 'Algeria', + 'as' => 'American Samoa', + 'ad' => 'Andorra', + 'ao' => 'Angola', + 'ai' => 'Anguilla', + 'aq' => 'Antarctica', + 'ag' => 'Antigua and Barbuda', + 'ar' => 'Argentina', + 'am' => 'Armenia', + 'aw' => 'Aruba', + 'au' => 'Australia', + 'at' => 'Austria', + 'az' => 'Azerbaijan', + 'bs' => 'Bahamas', + 'bh' => 'Bahrain', + 'bd' => 'Bangladesh', + 'bb' => 'Barbados', + 'by' => 'Belarus', + 'be' => 'Belgium', + 'bz' => 'Belize', + 'bj' => 'Benin', + 'bm' => 'Bermuda', + 'bt' => 'Bhutan', + 'bo' => 'Bolivia', + 'ba' => 'Bosnia and Herzegovina', + 'bw' => 'Botswana', + 'bv' => 'Bouvet Island', + 'br' => 'Brazil', + 'io' => 'British Indian Ocean Territory', + 'bn' => 'Brunei Darussalam', + 'bg' => 'Bulgaria', + 'bf' => 'Burkina Faso', + 'bi' => 'Burundi', + 'kh' => 'Cambodia', + 'cm' => 'Cameroon', + 'cv' => 'Cape Verde', + 'ky' => 'Cayman Islands', + 'cf' => 'Central African Republic', + 'td' => 'Chad', + 'cl' => 'Chile', + 'cn' => 'China', + 'cx' => 'Christmas Island', + 'cc' => 'Cocos (keeling) Islands', + 'co' => 'Colombia', + 'km' => 'Comoros', + 'cg' => 'Congo', + 'cd' => 'Congo, Democratic Republic of the', + 'ck' => 'Cook Islands', + 'cr' => 'Costa Rica', + 'ci' => 'Cote D\'ivoire', + 'hr' => 'Croatia', + 'cu' => 'Cuba', + 'cy' => 'Cyprus', + 'cz' => 'Czech Republic', + 'dk' => 'Denmark', + 'dj' => 'Djibouti', + 'dm' => 'Dominica', + 'do' => 'Dominican Republic', + 'ec' => 'Ecuador', + 'eg' => 'Egypt', + 'sv' => 'El Salvador', + 'gq' => 'Equatorial Guinea', + 'er' => 'Eritrea', + 'ee' => 'Estonia', + 'et' => 'Ethiopia', + 'fk' => 'Falkland Islands (malvinas)', + 'fo' => 'Faroe Islands', + 'fj' => 'Fiji', + 'fi' => 'Finland', + 'fr' => 'France', + 'gf' => 'French Guiana', + 'pf' => 'French Polynesia', + 'tf' => 'French Southern Territories', + 'ga' => 'Gabon', + 'gm' => 'Gambia', + 'ge' => 'Georgia', + 'de' => 'Germany', + 'gh' => 'Ghana', + 'gi' => 'Gibraltar', + 'gr' => 'Greece', + 'gl' => 'Greenland', + 'gd' => 'Grenada', + 'gp' => 'Guadeloupe', + 'gu' => 'Guam', + 'gt' => 'Guatemala', + 'gn' => 'Guinea', + 'gw' => 'Guinea-bissau', + 'gy' => 'Guyana', + 'ht' => 'Haiti', + 'hm' => 'Heard Island and Mcdonald Islands', + 'va' => 'Holy See (Vatican City State)', + 'hn' => 'Honduras', + 'hk' => 'Hong Kong', + 'hu' => 'Hungary', + 'is' => 'Iceland', + 'in' => 'India', + 'id' => 'Indonesia', + 'ir' => 'Iran, Islamic Republic of', + 'iq' => 'Iraq', + 'ie' => 'Ireland', + 'il' => 'Israel', + 'it' => 'Italy', + 'jm' => 'Jamaica', + 'jp' => 'Japan', + 'jo' => 'Jordan', + 'kz' => 'Kazakhstan', + 'ke' => 'Kenya', + 'ki' => 'Kiribati', + 'kp' => 'Korea, Democratic People\'s Republic of', + 'kr' => 'Korea, Republic of', + 'kw' => 'Kuwait', + 'kg' => 'Kyrgyzstan', + 'la' => 'Lao People\'s Democratic Republic', + 'lv' => 'Latvia', + 'lb' => 'Lebanon', + 'ls' => 'Lesotho', + 'lr' => 'Liberia', + 'ly' => 'Libyan Arab Jamahiriya', + 'li' => 'Liechtenstein', + 'lt' => 'Lithuania', + 'lu' => 'Luxembourg', + 'mo' => 'Macao', + 'mk' => 'Macedonia, Former Yugoslav Republic of', + 'mg' => 'Madagascar', + 'mw' => 'Malawi', + 'my' => 'Malaysia', + 'mv' => 'Maldives', + 'ml' => 'Mali', + 'mt' => 'Malta', + 'mh' => 'Marshall Islands', + 'mq' => 'Martinique', + 'mr' => 'Mauritania', + 'mu' => 'Mauritius', + 'yt' => 'Mayotte', + 'mx' => 'Mexico', + 'fm' => 'Micronesia, Federated States of', + 'md' => 'Moldova, Republic of', + 'mc' => 'Monaco', + 'mn' => 'Mongolia', + 'ms' => 'Montserrat', + 'ma' => 'Morocco', + 'mz' => 'Mozambique', + 'mm' => 'Myanmar', + 'na' => 'Namibia', + 'nr' => 'Nauru', + 'np' => 'Nepal', + 'nl' => 'Netherlands', + 'an' => 'Netherlands Antilles', + 'nc' => 'New Caledonia', + 'nz' => 'New Zealand', + 'ni' => 'Nicaragua', + 'ne' => 'Niger', + 'ng' => 'Nigeria', + 'nu' => 'Niue', + 'nf' => 'Norfolk Island', + 'mp' => 'Northern Mariana Islands', + 'no' => 'Norway', + 'om' => 'Oman', + 'pk' => 'Pakistan', + 'pw' => 'Palau', + 'ps' => 'Palestinian Territory, Occupied', + 'pa' => 'Panama', + 'pg' => 'Papua New Guinea', + 'py' => 'Paraguay', + 'pe' => 'Peru', + 'ph' => 'Philippines', + 'pn' => 'Pitcairn', + 'pl' => 'Poland', + 'pt' => 'Portugal', + 'pr' => 'Puerto Rico', + 'qa' => 'Qatar', + 're' => 'Reunion', + 'ro' => 'Romania', + 'ru' => 'Russia', + 'rw' => 'Rwanda', + 'sh' => 'Saint Helena', + 'kn' => 'Saint Kitts and Nevis', + 'lc' => 'Saint Lucia', + 'pm' => 'Saint Pierre and Miquelon', + 'vc' => 'Saint Vincent and the Grenadines', + 'ws' => 'Samoa', + 'sm' => 'San Marino', + 'st' => 'Sao Tome and Principe', + 'sa' => 'Saudi Arabia', + 'sn' => 'Senegal', + 'cs' => 'Serbia and Montenegro', + 'sc' => 'Seychelles', + 'sl' => 'Sierra Leone', + 'sg' => 'Singapore', + 'sk' => 'Slovakia', + 'si' => 'Slovenia', + 'sb' => 'Solomon Islands', + 'so' => 'Somalia', + 'za' => 'South Africa', + 'gs' => 'South Georgia & the South Sandwich Islands', + 'es' => 'Spain', + 'lk' => 'Sri Lanka', + 'sd' => 'Sudan', + 'sr' => 'Suriname', + 'sj' => 'Svalbard and Jan Mayen', + 'sz' => 'Swaziland', + 'se' => 'Sweden', + 'ch' => 'Switzerland', + 'sy' => 'Syrian Arab Republic', + 'tw' => 'Taiwan', + 'tj' => 'Tajikistan', + 'tz' => 'Tanzania, United Republic of', + 'th' => 'Thailand', + 'tl' => 'Timor-leste', + 'tg' => 'Togo', + 'tk' => 'Tokelau', + 'to' => 'Tonga', + 'tt' => 'Trinidad and Tobago', + 'tn' => 'Tunisia', + 'tr' => 'Turkey', + 'tm' => 'Turkmenistan', + 'tc' => 'Turks and Caicos Islands', + 'tv' => 'Tuvalu', + 'ug' => 'Uganda', + 'ua' => 'Ukraine', + 'ae' => 'United Arab Emirates', + 'gb' => 'United Kingdom', + 'um' => 'United States Minor Outlying Islands', + 'uy' => 'Uruguay', + 'uz' => 'Uzbekistan', + 'vu' => 'Vanuatu', + 've' => 'Venezuela', + 'vn' => 'Vietnam', + 'vg' => 'Virgin Islands, British', + 'vi' => 'Virgin Islands, U.S.', + 'wf' => 'Wallis and Futuna', + 'eh' => 'Western Sahara', + 'ye' => 'Yemen', + 'zm' => 'Zambia', + 'zw' => 'Zimbabwe', + '--' => 'Other/Not Listed', )); loader_import ('petition.Objects'); inc/app/petition/conf/properties.php @@ -10,7 +10,7 @@ class PetitionSignForm extends MailForm { } function onSubmit ($vals) { db_execute ( - 'insert into petition_signature values (null, ?, ?, ?, ?, ?, ?, ?, ?, now())', + 'insert into petition_signature values (null, ?, ?, ?, ?, ?, ?, ?, ?, ?, now())', $vals['id'], $vals['firstname'], $vals['lastname'], @@ -18,6 +18,7 @@ class PetitionSignForm extends MailForm { $vals['address'], $vals['city'], $vals['province'], + $vals['country'], $vals['postal_code'] ); inc/app/petition/forms/sign/index.php @@ -2,6 +2,7 @@ method = post error_mode = all +message = * Required fields. [id] @@ -10,19 +11,19 @@ type = hidden [firstname] type = text -alt = First Name +alt = First Name* rule 1 = not empty, You must enter your first name. [lastname] type = text -alt = Last Name +alt = Last Name* rule 1 = not empty, You must enter your last name. [email] type = text -alt = Email Address +alt = Email Address* ;rule 1 = not empty, You must enter your email address. ;rule 2 = email, Your email address does not appear to be valid. ;rule 3 = "unique `petition_signature/email`, You may only sign once. We found your email address already in the signature list." @@ -35,20 +36,28 @@ alt = Mailing Address [city] type = text -alt = City or Town +alt = City or Town* rule 1 = not empty, You must enter your city or town. [province] type = select -alt = Province/Territory +alt = Province/Territory* setValues = "eval: appconf ('provinces')" rule 1 = not empty, You must select your province or territory. +[country] + +type = select +alt = Country* +setValues = "eval: appconf ('countries')" +setDefault = "eval: appconf ('default_country')" +rule 1 = not empty, You must select your country. + [postal_code] type = text -alt = Postal Code +alt = Zip/Postal Code [secure] inc/app/petition/forms/sign/settings.php @@ -24,7 +24,7 @@ {loop obj[list]} <tr class="{alt/next}"> <td>{loop/num}. {loop/firstname} {loop/lastname}</td> - <td>{loop/city}, {filter petition_filter_province}{loop/province}{end filter}</td> + <td>{loop/city}{if loop.province ne '--' and loop.province ne ''}, {filter petition_filter_province}{loop/province}{end filter}{end if}{if loop.country ne '--' and loop.country ne ''}, {filter petition_filter_country}{loop/country}{end filter}{end if}</td> </tr> {end loop} </table> inc/app/petition/html/signatures.spt @@ -19,8 +19,9 @@ create table petition_signature ( email char(72) not null, address char(72) not null, city char(48) not null, - province char(48) not null, - postal_code char(8) not null, + province char(2) not null, + country char(2) not null, + postal_code char(10) not null, ts datetime not null, index (petition_id, ts) ); inc/app/petition/install/install-mysql.sql @@ -9,4 +9,9 @@ function petition_filter_province ($prov) { return $list[$prov]; } +function petition_filter_country ($c) { + $list = appconf ('countries'); + return $list[$c]; +} + ?> \ No newline at end of file inc/app/petition/lib/Filters.php @@ -940,8 +940,9 @@ create table petition_signature ( email char(72) not null, address char(72) not null, city char(48) not null, - province char(48) not null, - postal_code char(8) not null, + province char(2) not null, + country char(2) not null, + postal_code char(10) not null, ts datetime not null, index (petition_id, ts) ); install/install-mysql.sql @@ -940,8 +940,9 @@ create table petition_signature ( email char(72) not null, address char(72) not null, city char(48) not null, - province char(48) not null, - postal_code char(8) not null, + province char(2) not null, + country char(2) not null, + postal_code char(10) not null, ts datetime not null, index (petition_id, ts) ); install/install-old.sql @@ -85,3 +85,7 @@ create table myadm_report_results ( results mediumtext not null, index (report_id, run) ); + +alter table petition_signature change column province province char(2) not null; +alter table petition_signature add column country char(2) not null after province; +alter table petition_signature change column postal_code postal_code char(10) not null; \ No newline at end of file upgrade/5.0.1-5.0.2.sql 2f49ecb8fa2fd2e3d9df37b7bfeddc479c13cdfd John Luxford lux@www.dojolearning.lo http://github.com/lux/sitellite/commit/5f49fb7b96d73bdaa29d998856ac25d9d4fc5d29 5f49fb7b96d73bdaa29d998856ac25d9d4fc5d29 2009-04-09T01:37:08-07:00 2009-04-09T01:37:08-07:00 Added countries to petition app. ef0ba2c79af69e3d4fb370eb6c228d60153c03c7 John Luxford lux@www.dojolearning.lo