summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlistandshare on ubuntu01 <jmorgan@foursquarestaff.com>2011-06-03 09:36:02 -0700
committerJesse Morgan <jesse@jesterpm.net ; true>2011-06-03 09:36:02 -0700
commit546f20c9f81b2a3e515141726c50d2621c2411df (patch)
treefa9da307b5b1ecdcfd092f53bd8690b420bacfe9
parentc4931852362c7a54498742ced909a81c42fc1209 (diff)
parentbd11955780a958fdee35d03c94b88e65eea3cdd3 (diff)
Merge branch 'master' of 10.20.30.9:git/community
-rw-r--r--design/database.sql7
-rwxr-xr-xscripts/forward_emails.php5
2 files changed, 8 insertions, 4 deletions
diff --git a/design/database.sql b/design/database.sql
index 06b607c..475dac2 100644
--- a/design/database.sql
+++ b/design/database.sql
@@ -26,6 +26,7 @@ CREATE TABLE category (
id INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
shortname VARCHAR(30) NOT NULL,
name VARCHAR(30) NOT NULL,
+ description VARCHAR(255) NOT NULL,
PRIMARY KEY(id)
);
@@ -93,11 +94,11 @@ CREATE TABLE page (
-- The following creates some sample data
INSERT INTO category (name, shortname) VALUES
+ ('Give', 'give'),
+ ('Needs', 'needs'),
('Jobs', 'jobs'),
('Housing', 'housing'),
- ('Events', 'events'),
- ('For Sale','forsale'),
- ('Needs', 'needs');
+ ('Events', 'events');
INSERT INTO source (name) VALUES ('Foursquare Church');
diff --git a/scripts/forward_emails.php b/scripts/forward_emails.php
index ae84ee3..92c7563 100755
--- a/scripts/forward_emails.php
+++ b/scripts/forward_emails.php
@@ -47,10 +47,13 @@ foreach ($splitmsg as $line) {
$subject = $header[1];
break;
- case 'delivered-to':
+ case 'x-original-to':
$to = $header[1];
break;
+ case 'delivered-to':
+ break;
+
default:
$headers .= "$line\n";
}