updates from ws6 side

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..bc3cbf7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+common/
+compiled/

diff --git a/config/application.ini b/config/application.ini
index 0069af5..088f5e6 100644 (file)
--- a/config/application.ini
+++ b/config/application.ini
@@ -23,33 +23,33 @@ contactdb.production_mode = "ON"
 ; turn on for html email
 contactdb.html_email = "ON"
 ; Turn on the streamsend module to use with our contact application
-contactdb.streamsend.application = On
+contactdb.streamsend.application = Off
 ; Login id for the streamsend account
-contactdb.streamsend.login = "SHdXmtOkCosG"
+contactdb.streamsend.login = ""
 ; Transaction key for the streamsend account
-contactdb.streamsend.key = "8oeCoVO6FeFqTIxf"
+contactdb.streamsend.key = ""
 ; Streamsend account name
-contactdb.streamsend.account_name = "Sault Ste Marie CVB"
+contactdb.streamsend.account_name = ""
 ; Streamsend audience number
-contactdb.streamsend.audience = "1"
+contactdb.streamsend.audience = ""
 
 ; Turn the coupon application On or Off
-coupons.application = On
+coupons.application = Off
 
 ; Turn the event application On or Off
-eventdb.application = On
+eventdb.application = Off
 ; Turn the Events Common Application On or Off
-eventdb.commonEvents = On
+eventdb.commonEvents = Off
 ; The page id in the toolbox that holds the event calendar
 eventdb.event_page = 5
 ; Turn the home page events module On or Off for the event application
-eventdb.home_events = On
+eventdb.home_events = Off
 
 ; Turn the google search application On of Off
 google.search.application = Off
 
 ; Turn on Gaslight Media Search application On or Off
-glmsearch.application = On
+glmsearch.application = Off
 glmsearch.index = "Index_1"
 glmsearch.site = "www.saultstemarie.com"
 glmsearch.login = "WebsiteServices"
@@ -59,7 +59,7 @@ glmsearch.key = "829800701e8440b67a78e3afbefa1049"
 headlines.application = Off
 
 ; Turn the member application On or Off
-memberdb.application = On
+memberdb.application = Off
 ; The page id in the toolbox that holds the login box to the members only area
 memberdb.login_page = 19
 ; The page id in the toolbox that is the members only area home page
@@ -93,10 +93,10 @@ news.home = Off
 news.page = Off
 
 ; Turn the photo gallery application On or Off
-photo_gallery.application = On
+photo_gallery.application = Off
 
 ; Turn the rotating image application On or Off
-rotating_images.application = On
+rotating_images.application = Off
 
 ; Turn the weather application On or Off
 weather.application = Off
@@ -105,16 +105,16 @@ weather.application = Off
 ; Turn the event registration application On or Off
 event_registration.application = On
 ; Customer Information
-event_registration.organization = "Sault Ste Marie"
-event_registration.organization_short = "Sault Ste Marie"
-event_registration.organization_address = "225 E Portage Avenue"
-event_registration.organization_city = "Sault Ste. Marie"
+event_registration.organization = "Gaslight Media"
+event_registration.organization_short = "Gaslight Media"
+event_registration.organization_address = "120 E Lake St."
+event_registration.organization_city = "Petoskey"
 event_registration.organization_state = "MI"
-event_registration.organization_zip = "49783"
-event_registration.organization_phone = "(906) 632-3366"
+event_registration.organization_zip = "49770"
+event_registration.organization_phone = "(231) 487-0692"
 event_registration.organization_toll_free = ""
-event_registration.organization_internal_email = "admin@saultstemarie.com"
-event_registration.organization_from_email = "news@saultstemarie.com"
+event_registration.organization_internal_email = "dev@gaslightmedia.com"
+event_registration.organization_from_email = "from@gaslightmedia.com"
 ; General Setup
 event_registration.copyright_start = 2010
 event_registration.event_page = 88

diff --git a/config/server.ini b/config/server.ini
index ddda08c..5386e81 100644 (file)
--- a/config/server.ini
+++ b/config/server.ini
@@ -1,7 +1,7 @@
 ; Production site configuration data
 [production]
 ; Name used in the title tag, admin area and emails
-site_url = "https://tickets.gaslightmedia.com/"
+site_url = "http://tickets.gaslightmedia.com/"
 coupon_site_url = "tickets.gaslightmedia.com"
 
 ; Link URL to access mobile site to home page

diff --git a/config/site.ini b/config/site.ini
index 3eb50a9..96eb76d 100644 (file)
--- a/config/site.ini
+++ b/config/site.ini
@@ -3,7 +3,7 @@
 ; Home page id of site in the toolbox
 home_id = 1
 ; Name to use in title tag and admin
-sitename = "Sault Ste Marie"
+sitename = "Gaslight Media"
 ; used in contactdb to limit number of entries per list
 entries_per_page = 10
 ; Turn short urls On or Off
@@ -14,15 +14,15 @@ mobile_site = Off
 
 
 ; Web Site Owner Information - for use by certain applications
-owner.name          = "Sault Ste. Marie Convention & Visitors Bureau"
-owner.short_name    = "Sault Ste. Marie"
-owner.address1      = "225 E Portage Ave."
+owner.name          = "Gaslight Media"
+owner.short_name    = "Gaslight Media"
+owner.address1      = "120 E Lake St."
 owner.address2      = False
-owner.city          = "Sault Ste. Marie"
+owner.city          = "Petoskey"
 owner.state         = "MI"
-owner.zip           = "49783"
+owner.zip           = "49770"
 owner.country       = "US"
-owner.phone         = "(906) 632-3366"
+owner.phone         = "(231) 487-0692"
 owner.toll_free     = False
 
 

diff --git a/setup.phtml b/setup.phtml
index d261c49..72e5a5f 100644 (file)
--- a/setup.phtml
+++ b/setup.phtml
@@ -47,7 +47,7 @@ if (($x = strlen($CALLED_FROM_DIR)) > 0) {
 }
 // Added to strip any trailing /'s to make sure we don't end up with many
 $base_url = preg_replace('|/*$|', '', $base_url);
-$BASE_URL = "https://$base_url";
+$BASE_URL = "http://$base_url";
 
 if (!isset($DEBUG)) {
     $DEBUG = (isset($mysecretcode) && $mysecretcode == 1234);