Changeset 1571482
- Timestamp:
- 01/09/2017 09:55:48 PM (9 years ago)
- Location:
- pushpress-integration
- Files:
-
- 12 edited
- 7 copied
-
tags/1.5.9 (copied) (copied from pushpress-integration/trunk)
-
tags/1.5.9/css/pushpress.css (copied) (copied from pushpress-integration/trunk/css/pushpress.css)
-
tags/1.5.9/inc/wp_pushpress_model.php (copied) (copied from pushpress-integration/trunk/inc/wp_pushpress_model.php)
-
tags/1.5.9/inc/wp_pushpress_shortcode.php (copied) (copied from pushpress-integration/trunk/inc/wp_pushpress_shortcode.php)
-
tags/1.5.9/pushpress.php (copied) (copied from pushpress-integration/trunk/pushpress.php)
-
tags/1.5.9/readme.txt (copied) (copied from pushpress-integration/trunk/readme.txt)
-
tags/1.5.9/templates/frontend/shortcode_schedules.php (copied) (copied from pushpress-integration/trunk/templates/frontend/shortcode_schedules.php)
-
trunk/admin/config.php (modified) (1 diff)
-
trunk/admin/main.php (modified) (1 diff)
-
trunk/lib/php-sdk/lib/Pushpress/ApiResource.php (modified) (4 diffs)
-
trunk/lib/php-sdk/lib/Pushpress/Calendar.php (modified) (1 diff)
-
trunk/lib/php-sdk/lib/Pushpress/ProductImages.php (modified) (2 diffs)
-
trunk/lib/php-sdk/lib/Pushpress/Pushpress.php (modified) (1 diff)
-
trunk/lib/php-sdk/lib/Pushpress/Subscriptions.php (modified) (1 diff)
-
trunk/pushpress.php (modified) (5 diffs)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/templates/frontend/shortcode_leads.php (modified) (1 diff)
-
trunk/templates/frontend/shortcode_plans.php (modified) (1 diff)
-
trunk/templates/frontend/shortcode_products.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pushpress-integration/trunk/admin/config.php
r1230496 r1571482 1 <?php 2 3 ?> 4 1 <?php ?> 5 2 <div class="pushpress-wrap"> 6 3 <div class="header"> -
pushpress-integration/trunk/admin/main.php
r1331831 r1571482 45 45 $linkTo = str_replace('{subdomain}', $this->subdomain, PUSHPRESS_CPANEL); 46 46 ?> 47 48 47 <div class="pushpress-wrap"> 49 48 <div class="header"> -
pushpress-integration/trunk/lib/php-sdk/lib/Pushpress/ApiResource.php
r1276989 r1571482 57 57 $requestor = new Pushpress_ApiRequestor($this->_apiKey); 58 58 $url = $this->emptyUrl(); 59 // echo $url;60 // die();61 59 list($response, $apiKey) = $requestor->request('get', $url, $this->_retrieveOptions); 62 60 $this->refreshFrom($response, $apiKey); … … 170 168 $requestor = new Pushpress_ApiRequestor($apiKey); 171 169 $url = self::_scopedLsb($class, 'classUrl', $class); 172 $url = preg_replace("/(ss)$/", "s", $url); 173 // echo $url; 174 // echo '<br>'; 175 // var_dump($params); 176 //die(); 170 $url = preg_replace("/(ss)$/", "s", $url); 177 171 list($response, $apiKey) = $requestor->request('post', $url, $params); 178 172 return Pushpress_Util::convertToPushpressObject($response, $apiKey); … … 187 181 if (count($params) > 0) { 188 182 $url = $this->instanceUrl(); 189 // echo "<br>URL: " . $url; 190 // echo "<br>params:<br>"; 191 // var_dump($params); 192 // die(); 193 183 194 184 list($response, $apiKey) = $requestor->request('post', $url, $params); 195 185 $this->refreshFrom($response, $apiKey); … … 203 193 $requestor = new Pushpress_ApiRequestor($this->_apiKey); 204 194 $params = $this->serializeParameters(); 205 // echo 'PRARAMS:<br>';var_dump($params); 206 // die(); 195 207 196 if (count($params) > 0) { 208 197 $url = $this->instanceUrl(); -
pushpress-integration/trunk/lib/php-sdk/lib/Pushpress/Calendar.php
r1230496 r1571482 86 86 $url = self::classUrl($class); 87 87 $url .= "/registrations"; 88 echo $url;89 88 $requestor = new Pushpress_ApiRequestor(); 90 89 -
pushpress-integration/trunk/lib/php-sdk/lib/Pushpress/ProductImages.php
r1230496 r1571482 61 61 ); 62 62 $requestor = new Pushpress_ApiRequestor($this->_apiKey); 63 echo 'createPreorder url: ' . $url;64 var_dump($params);65 63 66 64 list($response, $apiKey) = $requestor->request('post', $url, $params); 67 65 //$this->refreshFrom(array('subscription' => $response), $apiKey, true); 68 echo "response" .69 var_dump( $response);70 66 return $response; 71 67 } … … 79 75 ); 80 76 $requestor = new Pushpress_ApiRequestor($this->_apiKey); 81 echo 'saveImages url: ' . $url;82 var_dump($params);83 77 84 78 list($response, $apiKey) = $requestor->request('post', $url, $params); 85 79 //$this->refreshFrom(array('subscription' => $response), $apiKey, true); 86 echo "response" .87 var_dump( $response);88 80 return $response; 89 81 } -
pushpress-integration/trunk/lib/php-sdk/lib/Pushpress/Pushpress.php
r1276989 r1571482 9 9 10 10 public final function __construct() { 11 echo '<bR>constructing API:'; 12 var_dump($this); 11 13 12 } 14 13 -
pushpress-integration/trunk/lib/php-sdk/lib/Pushpress/Subscriptions.php
r1230496 r1571482 71 71 $url = $this->instanceUrl() . '/contracts'; 72 72 $params = array(); 73 // echo '<br>options:<br>';74 // var_dump($params);75 73 $requestor = new Pushpress_ApiRequestor($this->_apiKey); 76 74 -
pushpress-integration/trunk/pushpress.php
r1567572 r1571482 1 <?php1 <?php 2 2 /** 3 3 * @package WP-PushPress 4 * @version 1.5. 94 * @version 1.5.10 5 5 */ 6 6 /* … … 9 9 Description: Easily integrate your workouts, calendar, products, membership plans, events and more with your Wordpress blog! This plugin is a free add-on for existing PushPress clients. See https://pushpress.com for more info. 10 10 Author: PushPress, Inc 11 Version: 1.5. 911 Version: 1.5.10 12 12 Author URI: https://pushpress.com 13 13 */ 14 14 define('PUSHPRESS_LOCAL', FALSE); 15 15 define('PUSHPRESS_DEV', FALSE); 16 define( 'PP_PLUGIN_VERSION', '1.5. 9');16 define( 'PP_PLUGIN_VERSION', '1.5.10'); 17 17 define( 'PUSHPRESS_ERROR_REPORT', 0 ); 18 18 define( 'PUSHPRESS_BUTTON_CLASS', 'pushpress-button-class-' . rand(0, 10000)); … … 55 55 add_action( 'wp_enqueue_scripts', array($this, 'pushpress_head_style') ); 56 56 add_action( 'wp_enqueue_scripts', array($this, 'pushpress_head_script'), 30); 57 57 58 58 $this->model = new Wp_Pushpress_Model(); 59 59 add_action( 'wp_ajax_pushpress_ajax', array($this->model, 'save_integration_page_status') ); … … 71 71 echo"<div class=\"$class\"> <p>$message</p></div>"; 72 72 } 73 73 74 74 75 function _checkDependencies() { 75 76 $errors = array(); 77 76 78 if(!function_exists('curl_init')) { 77 $errors[] = ' Your environment does not support for CURL. You could not setup or run Pushpress plugin properly';79 $errors[] = 'In order to run the PushPress plugin, cURL support must be enabled (and it is not). Please talk to your hosting provider to see if they can enable cURL support.'; 78 80 } 79 81 return $errors; … … 82 84 function activation(){ 83 85 $errors = $this->_checkDependencies(); 86 84 87 if(!empty($errors)) { 85 echo '<div style="color: #bd0000; border: 1px solid #bd0000; border-radius: 5px; padding: 10px;">'; 86 foreach($errors as $error) { 87 echo '<div>' . $error . '</div>'; 88 } 89 echo '</div>'; 90 exit; 91 } 88 $error_message = "<strong>There was an error installing PushPress</strong><br><br>" . implode("<br>", $errors); 89 deactivate_plugins( plugin_basename( __FILE__ ) ); 90 wp_die( __( $error_message, 'my-plugin' ), 'Plugin dependency check', array( 'back_link' => true ) ); 91 } 92 else { 93 // echo '<div style="color: #bd0000; border: 1px solid #bd0000; border-radius: 5px; padding: 10px;">Siuccess</div>'; 94 } 95 96 $error = ob_get_contents(); 97 mail("dan@pushpress.com", "WP Install Error", $error); 98 92 99 } 93 100 -
pushpress-integration/trunk/readme.txt
r1567572 r1571482 120 120 = 1.5.9 = 121 121 Fixed bug that was calculating average lead value incorrectly for FB Lead conversions. 122 123 = 1.5.10 = 124 Fixed issue causing some systems to hang up / freeze due to output of characters before the <!DOCTYPE> -
pushpress-integration/trunk/templates/frontend/shortcode_leads.php
r1453043 r1571482 191 191 </ul> 192 192 </div> 193 194 -
pushpress-integration/trunk/templates/frontend/shortcode_plans.php
r1500641 r1571482 114 114 ?> 115 115 </div> 116 -
pushpress-integration/trunk/templates/frontend/shortcode_products.php
r1500641 r1571482 59 59 } 60 60 } 61
Note: See TracChangeset
for help on using the changeset viewer.