Changeset 1393770

Timestamp:

04/13/2016 07:44:33 AM (10 years ago)

Author:

gorbachiov

Message:

version 1.4.2

Location:

eventupon-calendar/trunk

Files:

• eventupon-calendar.php (modified) (5 diffs)
• readme.txt (modified) (1 diff)
• settings.php (modified) (3 diffs)

eventupon-calendar/trunk/eventupon-calendar.php

@@ -4 +4 @@
 Plugin URI: https://wordpress.org/plugins/eventupon-calendar/
 Description: Displays events from EventUpon.com, activate and place [eu-calendar] tag to a page you want to have the calendar.
-Version: 1.4.1
+Version: 1.4.2
 Author: Max Kovrigovich
 Author URI: https://www.linkedin.com/in/max-kovrigovich-007bb888
@@ -32 +32 @@
         const EU_CALENDAR_TAG = 'eu-calendar';
         const EU_CALENDAR_BASE = 'www.eventupon.com';
-        //const EU_CALENDAR_BASE = 'www.eventupon.us';
+//        const EU_CALENDAR_BASE = 'www.eventupon.us';
         //const EU_CALENDAR_BASE = 'www.eventupon.dev';
         //const EU_CALENDAR_BASE = 'www.eventupon';
         const PREFIX = 'eventupon_calendar';
 
+
+        private static $https_prefix;
         private $event_api_url;
         private $token;
@@ -56 +58 @@
             require_once(sprintf("%s/settings.php", dirname(__FILE__)));
             $this->pageSettings = new EventUpon_Calendar_Settings();
+            self::$https_prefix = get_option(EventUpon_Calendar::PREFIX . '_http_s', 'http');
             $this->token = get_option(EventUpon_Calendar::PREFIX . '_saved_search_id', '');
+//            $this->event_api_url = self::$https_prefix."://" . self::EU_CALENDAR_BASE . "/services/rest.json?";
             $this->event_api_url = "http://" . self::EU_CALENDAR_BASE . "/services/rest.json?";
             /* require_once(sprintf("%s/add_event.php", dirname(__FILE__)));
@@ -400 +404 @@
             delete_option(EventUpon_Calendar::PREFIX . '_header_text_color');
             delete_option(EventUpon_Calendar::PREFIX . '_view_mode');
+            delete_option(EventUpon_Calendar::PREFIX . '_http_s');
             delete_option(EventUpon_Calendar::PREFIX . '_saved_search_id');
             delete_option(EventUpon_Calendar::PREFIX . '_url');
@@ -427 +432 @@
             $colorHeaderText = get_option(EventUpon_Calendar::PREFIX . '_header_text_color', '#000000');
             $cssFile = get_option(EventUpon_Calendar::PREFIX . '_css_file', '');
-            $url = get_option(EventUpon_Calendar::PREFIX . '_url', '//' . self::EU_CALENDAR_BASE . '/embed/calendar');
+            $url = preg_replace('/^http(s)?/i' , self::$https_prefix, get_option(EventUpon_Calendar::PREFIX . '_url', '//' . self::EU_CALENDAR_BASE . '/embed/calendar') );
             $activateLinks = get_option(EventUpon_Calendar::PREFIX . '_activate_links', 0);
 

eventupon-calendar/trunk/readme.txt

@@ -114 +114 @@
 == Changelog ==
 
+= 1.4.2 =
+
+Setting added for http or https.
+Updated readme.txt
+
 = 1.4.1 =
 

eventupon-calendar/trunk/settings.php

@@ -17 +17 @@
                 EventUpon_Calendar::PREFIX . '_height' => '1700px',
                 EventUpon_Calendar::PREFIX . '_view_mode' => 'agenda',
+                EventUpon_Calendar::PREFIX . '_http_s' => 'https',
                 EventUpon_Calendar::PREFIX . '_url' => '//' . EventUpon_Calendar::EU_CALENDAR_BASE . '/embed/calendar',
                 EventUpon_Calendar::PREFIX . '_background_color' => '#FFFFFF',
@@ -48 +49 @@
             register_setting(EventUpon_Calendar::PREFIX . '-group', EventUpon_Calendar::PREFIX . '_header_text_color');
             register_setting(EventUpon_Calendar::PREFIX . '-group', EventUpon_Calendar::PREFIX . '_view_mode');
+            register_setting(EventUpon_Calendar::PREFIX . '-group', EventUpon_Calendar::PREFIX . '_http_s');
             register_setting(EventUpon_Calendar::PREFIX . '-group', EventUpon_Calendar::PREFIX . '_saved_search_id');
             register_setting(EventUpon_Calendar::PREFIX . '-group', EventUpon_Calendar::PREFIX . '_activate_links');
@@ -96 +98 @@
                     'field' => EventUpon_Calendar::PREFIX . '_view_mode',
                     'options' => array('discovery' => 'Discovery', 'week' => 'Week', 'month' => 'Month', 'agenda' => 'Agenda'),
+                )
+            );
+
+            add_settings_field(
+                EventUpon_Calendar::PREFIX . '-calendar_http_s',
+                'URL Prefix (HTTPS/HTTP)',
+                array(&$this, 'settings_field_select'),
+                EventUpon_Calendar::PREFIX . '_general',
+                EventUpon_Calendar::PREFIX . '-section',
+                array(
+                    'field' => EventUpon_Calendar::PREFIX . '_http_s',
+                    'options' => array('http' => 'HTTP', 'https' => 'HTTPS'),
                 )
             );