Skip to content

Commit

Permalink
Merge branch 'owner2'
Browse files Browse the repository at this point in the history 
Conflicts:
	subdomains/www/cgi-bin/common.pl
  • Loading branch information
@karengaia
karengaia committed Aug 11, 2012
2 parents 7ca3204 + fa9814b commit 6841b3d
Show file tree
Hide file tree
Showing 64 changed files with 43,090 additions and 1,918 deletions.
11 changes: 10 additions & 1 deletion .gitignore
View file
@@ -1,6 +1,9 @@
.DS_Store
.htpasswd
awstats/awstats*.txt
go-up-to-home-overpop/gaias.procmailrc
go-up-to-home-overpop/procmail.txt
go-up-to-home-overpop/0.procmailrc
logs/*
settings_overrides.php
settings_overrides.pl
Expand All @@ -16,19 +19,25 @@ subdomains/mobile/index.html
subdomains/karenpittsMac.yes
subdomains/www/.htaccess.swp
subdomains/www/*.html
!volunteers.html
subdomains/www/*.htm
!subdomains/www/volunteers.html
*.bak
*.bkp
subdomains/www/autosubmit/control/count.txt
subdomains/www/autosubmit/elists/*.elist
subdomains/www/autosubmit/itemsSave/*
subdomains/www/autosubmit/itemsBkp/*
subdomains/www/autosubmit/popmail/*
subdomains/www/autosubmit/deleted/*.del
subdomains/www/autosubmit/items/*
subdomains/www/autosubmit/items/*.itm
subdomains/www/autosubmit/sections/*.idx
subdomains/www/autosubmit/sections_Backup_prod_2012-08-09/*
subdomains/www/autosubmit/sections/*.bak
subdomains/www/autosubmit/sections/*.cnt
subdomains/www/autosubmit/sections/*
subdomains/www/autosubmit/sepmail/*
subdomains/www/autosubmit/templates/*.mid
subdomains/www/autosubmit/volunteerEmail.txt
subdomains/www/cgi-bin/_save/*
subdomains/www/cgi-bin/_git_hold*
Expand Down
1 change: 1 addition & 0 deletions dbconnect.off
View file
@@ -0,0 +1 @@
dummy
1 change: 1 addition & 0 deletions 0.procmailrc → go-up-to-home-overpop/0.procmailrc
View file
Expand Up @@ -2,6 +2,7 @@ PATH=/usr/local/bin:/usr/bin:/bin

:0 c
* !^X-Spam-Status: Yes
overpop
* ^To: popnews@.*$
| /www/overpopulation.org/subdomains/www/cgi-bin/cgiwrap/popaware/getmail.pl

8 changes: 0 additions & 8 deletions overpop.procmailrc
View file

This file was deleted.

2 changes: 1 addition & 1 deletion settings.php
View file
Expand Up @@ -4,7 +4,7 @@
require dirname(__FILE__) . '/settings_overrides.php';
}
else {
$CONFIG['mysql_host'] = 'local';
$CONFIG['mysql_host'] = 'localhost';
$CONFIG['mysql_user'] = 'root';
$CONFIG['mysql_password'] = '';
$CONFIG['mysql_database'] = 'overpop';
Expand Down
5,104 changes: 5,096 additions & 8 deletions subdomains/www/autosubmit/bookmarks/WOA_bookmarks.html
View file

Large diffs are not rendered by default.

23 changes: 15 additions & 8 deletions subdomains/www/autosubmit/control/sections.html 100755 → 100644
View file
@@ -1,10 +1,11 @@
#sectsubid^seq^sectsub^fromsectsubid^fromsectsub^subdir^page^category^visable^preview^order1^pg2order^template^titletemplate^title^allor1^mobidesk^doclink^header^footer^ftpinfo^pg1items^pg2items^pg2header^more^subtitle^subtitletemplate^menutitle^keywordsmatch
1^10^Headlines_sustainability^0^^^headlines^N^V^R^A^A^headlineItem^stdTitle^News Headlines^all^desk^doclink^^^ftpdefault^70^0^^0^^^^
2^20^NewsDigest_headlines^2^Headlines_sustainability^^newsheadlines^ad^pp^D^A^A^newsheadlineItem^subSubtitle^Headlines^all^desk^doclink^^^ftpdefault^8^0^^0^^^^
1^10^Headlines_sustainability^0^^^headlines^N^V^R^D^D^headlineItem^stdTitle^News Headlines<br><small><small>Note: not all articles align with WOA!!s position</small></small>^all^desk^doclink^^^ftpdefault^200^0^^0^^^^
423^15^Headlines_priority^1^Headlines_sustainability^^^N^V^R^d^d^priorityItem^stdTitle^News Priority Headlines^all^desk^doclink^^^ftpdefault^70^0^^0^^^^
2^20^NewsDigest_headlines^1^Headlines_sustainability^^newsheadlines^ad^pp^D^A^A^newsheadlineItem^subSubtitle^Headlines^all^desk^doclink^^^ftpdefault^8^0^^0^^^^
3^30^NewsDigest_NewsItem^0^^^newsMidColumn^N^V^D^F^F^newsitem^stdTitle;pageIndex^Population &amp; Sustainability News Digest^all^desk^doclink^^pageIndex^ftpdefault^40^0^^0^^^^
4^40^NewsDigest_newsindex^3^NewsDigest_NewsItem^^newsindex^ad^pp^D^F^F^newsindexItem^^^all^desk^doclink^^^ftpdefault^40^0^^0^^^^
5^50^NewsDigest_newsmobile^3^NewsDigest_NewsItem^subdomains/mobile/^newsmobile^ad^mo^D^F^F^newsitem^WOAmobileTop^News Digest^all^mobi^nolink^^subPageIndex;plainEnd^ftpdefault^5^0^^0^^^^
6^60^NewsWeekly_WeeklyItem^3^NewsDigest_NewsItem^^^w^E^A^F^F^WeeklyItem^WklyTop^^all^desk^doclink^^^ftpNo^40^0^^0^^^^
6^60^NewsWeekly_WeeklyItem^3^NewsDigest_NewsItem^^^w^E^A^F^F^WeeklyItem^WklyTop^^all^desk^doclink^^^ftpNo^28^0^^0^^^^
7^70^WOAcommon_menu^0^^^menu^ad^pp^D^L^L^straight^^^all^desk^nolin^^^ftpdefault^70^0^^0^^^^
8^80^WOAcommon_sitemap^7^WOAcommon_menu^^sitemap^ad^pp^D^L^L^straight^stdSubtitle^Site Map^all^desk^doclink^^divend;plainEnd^ftpdefault^70^0^^0^^^^
9^90^WOAcommon_meta^0^^^meta^ad^hd^D^L^L^straight^^^all^desk^nolink^^^ftpdefault^70^0^^0^^^^
Expand All @@ -13,7 +14,8 @@
12^120^WOAcommon_woatext^0^^^woatext^ad^pp^D^L^L^straight^^^all^desk^nolink^^^ftpdefault^70^0^^0^^^^
13^130^NewsDigest_popclock^0^^^popclock^ad^pp^D^L^L^straight^^^all^desk^doclink^^^ftpdefault^70^0^^0^^^^
14^140^NewsDigest_pics^0^^^pg1_pics^ad^pp^D^F^F^straight^^^all^desk^doclink^^^ftpdefault^70^0^^0^^^^
15^150^NewsDigest_videos^0^^^videos^ad^pp^D^F^F^videoSidebarItem^subSubtitle^Important Videos, Media^all^desk^doclink^^^ftpdefault^10^0^^0^^^^
15^150^NewsDigest_videos^333^EducationalMaterials_videos^^videos^ad^pp^D^F^F^videoSidebarItem^subSubtitle^Important Videos, Media^all^desk^doclink^^^ftpdefault^10^0^^0^^^^
422^155^NewsDigest_alerts^323^HowToHelp_alerts^^newsalerts^ad^pp^D^F^F^newsalertItem^subSubtitle^Alerts, Take Action^all^desk^doclink^^^ftpdefault^3^0^^0^^^^
16^160^NewsDigest_ads^0^^^popads^ad^pp^D^F^F^straight^subSubtitle^WOA!! Suggests These Organizations^all^desk^doclink^^^ftpdefault^70^0^^0^^^^
17^170^NewsDigest_cartoons^0^^^cartoons^ad^pp^D^F^F^straight^^^all^desk^doclink^^^ftpdefault^70^0^^0^^^^
18^180^NewsDigest_HelpWOA^0^^^helpwoa^ad^pp^D^L^L^straight^subSubtitle^How You Can Help WOA^all^desk^doclink^^^ftpdefault^70^0^^0^^^^
Expand Down Expand Up @@ -62,7 +64,6 @@
61^610^Impacts_methane^0^^^impact^I^V^D^P^P^newsitem^stdSubtitle^Methane^all^desk^doclink^^subPageIndex^^7^70^^0^^^^
62^620^Impacts_GlobalWarmingItem^0^^^impact^I^V^D^P^P^newsitem^stdSubtitle^Climate Change^all^desk^doclink^^subPageIndex;WOApg2end^^7^70^^0^^^^
63^630^Sustainability_Top^0^^^solutions^ad^V^D^F^F^^stdTitle^Sustainability, Carrying Capacity, and Overconsumption^all^desk^^^^ftpdefault^70^70^^0^^^^
64^640^Sustainability_RightSidebar^0^^^solutions^ad^V^D^F^F^straight^rightsidebarTop^^all^desk^doclink^^divend^^70^70^^0^^^^
65^650^Sustainability_Intro^0^^^solutions^I^pp^A^L^L^introItem^^^all^desk^doclink^^^^70^70^^0^^^^
66^660^Sustainability_Sustainability^0^^^solutions^I^pp^A^P^P^newsitem^stdSubtitle^Sustainability in General^all^desk^doclink^^subPageIndex^^7^70^^0^^^^
67^670^Sustainability_Solutions^0^^^solutions^I^pp^A^P^P^newsitem^stdSubtitle^Solutions^all^desk^doclink^^subPageIndex^^7^70^^0^^^^
Expand Down Expand Up @@ -352,7 +353,7 @@
350^3500^Volunteer_specialItem^0^^^volunteer^A^V^A^L^L^linkItem^stdSubtitle^Special Assignments^all^desk^doclink^^^^70^70^^0^^^^
351^3510^Volunteer_newArticle^0^^^volntrNewArticle^A^V^A^F^F^^newArticle^New Article Submission^all^desk^doclink^^^ftpNo^70^70^^0^^^^
352^3520^Volunteer_SummarizeTop^0^^^volntrSummarize^A^V^A^F^F^newsitem^stdTitle^WOA!! Article Summarization^all^desk^doclink^^^ftpNo^70^70^^0^^^^
353^3530^Volunteer_headlines^2^Headlines_sustainability^volntrSummarize^A^V^A^A^H^H^^^all^desk^doclink^^^^30^70^70^^0^^^^
353^3530^Volunteer_headlines^2^Headlines_sustainability^volntrSummarize^^A^V^A^A^H^headlineitem^^^all^desk^doclink^^^^30^70^^0^^^^
354^3540^Volunteer_notes^0^^^volntrSummarize^A^V^A^F^F^newsitem^^^all^desk^doclink^^^^70^70^^0^^^^
355^3550^Volunteer_SuggestNotes^0^^^^A^V^A^H^H^newsitem^stdTitle^Suggested List Processing^all^desk^doclink^^^^70^70^^0^^^^
356^3560^Volunteer_eventsIntro^0^^^volntrEvents^A^V^A^F^F^newsitem^stdTitle^Volunteers Events Coordinator Page^all^desk^doclink^^^ftpNo^70^70^^0^^^^
Expand All @@ -363,8 +364,8 @@
361^3610^Volunteer_InsideItem^0^^^volntrInside^A^V^A^F^F^newsitem^^^all^desk^doclink^^^^70^70^^0^^^^
362^3620^Dictionary_Item^0^^^dictionary^A^V^A^H^H^newsitem^stdTitle^Population Glossary and Encyclopedia^all^desk^doclink^^^^70^70^^0^^^^
380^3800^Suggested_summarizedItem^0^^^summarized^N^V^R^F^F^suggestedItem^smallWOATop^Summarized^all^desk^doclink^^plainEnd^ftpdefault^70^70^^0^^^^
381^3810^Suggested_suggestedItem^0^^^suggested^N^V^R^F^F^selectUpdt_Item^selectUpdt_Top^^all^desk^doclink^^selectUpdt_End^ftpdefault^10^70^^0^^^^
382^3820^Suggested_emailedItem^0^^^emailed^N^A^A^F^F^emailedItem^subSubtitle^Emailed^all^desk^doclink^^^ftpDefault^50^70^^0^^^^
381^3810^Suggested_suggestedItem^0^^^suggested^N^V^R^F^F^selectUpdt_Item^selectUpdt_Top^Suggested Articles^all^desk^doclink^^selectUpdt_End^ftpdefault^10^70^^0^^^^
382^3820^Suggested_emailedItem^0^^^emailed^N^A^A^F^F^emailedItem^select_top^Emailed^all^desk^doclink^^select_end0^ftpDefault^50^70^^0^^^^
383^3830^delete_deleteItem^0^^^^w^V^R^F^F^recentItem^stdSubtitle^WOA!!s Autosubmit - Deleted Items^all^desk^doclink^^plainEnd^ftpNo^70^70^^0^^^^
384^3840^expired_expiredItem^0^^^^w^A^A^F^F^recentItem^stdSubtitle^WOA!!s Autosubmit - Expired Items^all^desk^doclink^^plainEnd^ftpNo^70^70^^0^^^^
385^3850^convert_Item^0^^^^w^V^A^F^F^cvrtUpdtItem^cvrtUpdtTop^Converted Items^all^desk^doclink^^selectUpdt_End^ftpNo^70^70^^0^^^^
Expand Down Expand Up @@ -401,3 +402,9 @@
416^4160^WebStuff_windows^0^^^webstuff^ad^V^A^F^F^newsitem^stdSubtitle^MS Windows^all^desk^doclink^^plainEnd^^70^70^^0^^^^
417^4170^WebStuff_other^0^^^webstuff^ad^V^A^F^F^newsitem^stdSubtitle^Other^all^desk^doclink^^plainEnd^^70^70^^0^^^^
418^4180^WebStuff_images^0^^^images^ad^V^A^F^F^newsitem^stdSubtitle^Images^all^desk^doclink^stdSubtitle^plainEnd^ftpNo^70^70^^0^^^^
424^4190^CSWP_Calendar^0^^^CSWPcalendar^c^pp^D^p^p^cswpEventItem^stdSubtitle^Calendar^all^desk^doclink^owner_top^plainEnd^ftpdefault^70^0^^0^^^^
425^5000^CSWP_MotherSch^0^^^CSWPmotherSch^c^pp^D^p^p^cswpMotherSchItem^^^all^desk^doclink^^^ftpdefault^70^0^^0^^^^
426^5010^CSWP_adminCalendar^0^^^CSWPadminCalendar^c^pp^D^p^p^cswpEventItem^stdSubtitle^CSWP Administrative Calendar^all^desk^doclink^owner_top^plainEnd^ftpdefault^70^0^^0^^^^
427^5020^Maidu_Community^0^^^MaiduCommunity^m^pp^D^P^P^ownerEventItem^stdSubtitle^Community Activities^all^desk^doclink^owner_top^plainEnd^ftpdefault^70^70^^0^^^^
429^5030^Maidu_MainTop^0^^^MaiduMainTop^m^pp^D^P^P^ownerEventItem^^^all^desk^doclink^^plainEnd^ftpdefault^70^70^^0^^^^
430^5040^Maidu_MainCol^0^^^MaiduMainCol^m^pp^D^P^P^ownerEventItem^^^all^desk^doclink^^^ftpdefault^7^70^^^^^^

0 comments on commit 6841b3d

Please sign in to comment.