Changeset 1553466
- Timestamp:
- 12/13/2016 09:08:22 AM (9 years ago)
- Location:
- stacksight
- Files:
-
- 8 edited
- 13 copied
-
tags/1.11.0 (copied) (copied from stacksight/trunk)
-
tags/1.11.0/assets/css/ss-admin.css (copied) (copied from stacksight/trunk/assets/css/ss-admin.css)
-
tags/1.11.0/readme.txt (copied) (copied from stacksight/trunk/readme.txt) (2 diffs)
-
tags/1.11.0/stacksight-php-sdk/bootstrap-drupal-6.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-6.php) (1 diff)
-
tags/1.11.0/stacksight-php-sdk/bootstrap-drupal-7.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-7.php) (3 diffs)
-
tags/1.11.0/stacksight-php-sdk/bootstrap-drupal-8.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-8.php) (3 diffs)
-
tags/1.11.0/stacksight-php-sdk/bootstrap-magento-2.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-magento-2.php) (1 diff)
-
tags/1.11.0/stacksight-php-sdk/bootstrap-symfony-2.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-symfony-2.php) (1 diff)
-
tags/1.11.0/stacksight-php-sdk/bootstrap-wp.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/bootstrap-wp.php) (5 diffs)
-
tags/1.11.0/stacksight-php-sdk/composer.json (copied) (copied from stacksight/trunk/stacksight-php-sdk/composer.json)
-
tags/1.11.0/stacksight-php-sdk/platforms/SSMagento2Client.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/platforms/SSMagento2Client.php)
-
tags/1.11.0/stacksight-php-sdk/platforms/SSSymfony2Client.php (copied) (copied from stacksight/trunk/stacksight-php-sdk/platforms/SSSymfony2Client.php)
-
tags/1.11.0/wp-stacksight.php (copied) (copied from stacksight/trunk/wp-stacksight.php) (14 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/stacksight-php-sdk/bootstrap-drupal-6.php (modified) (1 diff)
-
trunk/stacksight-php-sdk/bootstrap-drupal-7.php (modified) (3 diffs)
-
trunk/stacksight-php-sdk/bootstrap-drupal-8.php (modified) (3 diffs)
-
trunk/stacksight-php-sdk/bootstrap-magento-2.php (modified) (1 diff)
-
trunk/stacksight-php-sdk/bootstrap-symfony-2.php (modified) (1 diff)
-
trunk/stacksight-php-sdk/bootstrap-wp.php (modified) (5 diffs)
-
trunk/wp-stacksight.php (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
-
stacksight/tags/1.11.0/readme.txt
r1502175 r1553466 4 4 Requires at least: 3.5 5 5 Tested up to: 4.3 6 Stable tag: 1.1 0.56 Stable tag: 1.11.0 7 7 License: GPLv2 or later 8 8 … … 86 86 87 87 == Changelog == 88 = 1.11.0 = 89 - Save application settings in DB 90 88 91 = 1.10.5 = 89 92 - Fix compatibility with PHP < 5.5 -
stacksight/tags/1.11.0/stacksight-php-sdk/bootstrap-drupal-6.php
r1495173 r1553466 17 17 define('DOCS_URL', '#'); 18 18 19 if(defined('STACKSIGHT_ TOKEN')){20 if(defined('STACKSIGHT_ APP_ID'))21 $ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_APP_ID);19 if(defined('STACKSIGHT_PRIVATE_KEY')){ 20 if(defined('STACKSIGHT_PUBLIC_KEY')) 21 $ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_PUBLIC_KEY); 22 22 else 23 $ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL);23 $ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL); 24 24 $handle_errors = FALSE; 25 25 $handle_fatal_errors = TRUE; -
stacksight/tags/1.11.0/stacksight-php-sdk/bootstrap-drupal-7.php
r1495173 r1553466 94 94 case 'stacksight_app_id': 95 95 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true){ 96 if (!defined('STACKSIGHT_ APP_ID') && $option) {97 define('STACKSIGHT_ APP_ID', $option);96 if (!defined('STACKSIGHT_PUBLIC_KEY') && $option) { 97 define('STACKSIGHT_PUBLIC_KEY', $option); 98 98 } 99 99 } … … 101 101 case 'stacksight_token': 102 102 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true){ 103 if (!defined('STACKSIGHT_ TOKEN') && $option) {104 define('STACKSIGHT_ TOKEN', $option);103 if (!defined('STACKSIGHT_PRIVATE_KEY') && $option) { 104 define('STACKSIGHT_PRIVATE_KEY', $option); 105 105 } 106 106 } … … 148 148 } 149 149 150 if(defined('STACKSIGHT_ TOKEN')){151 if(defined('STACKSIGHT_ APP_ID'))152 $this->ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_APP_ID);150 if(defined('STACKSIGHT_PRIVATE_KEY')){ 151 if(defined('STACKSIGHT_PUBLIC_KEY')) 152 $this->ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_PUBLIC_KEY); 153 153 else 154 $this->ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL);154 $this->ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL); 155 155 156 156 $handle_errors = FALSE; -
stacksight/tags/1.11.0/stacksight-php-sdk/bootstrap-drupal-8.php
r1495173 r1553466 81 81 case 'app_id': 82 82 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true) { 83 if (!defined('STACKSIGHT_ APP_ID') && $option) {84 define('STACKSIGHT_ APP_ID', $option);83 if (!defined('STACKSIGHT_PUBLIC_KEY') && $option) { 84 define('STACKSIGHT_PUBLIC_KEY', $option); 85 85 } 86 86 } … … 88 88 case 'token': 89 89 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true) { 90 if (!defined('STACKSIGHT_ TOKEN') && $option) {91 define('STACKSIGHT_ TOKEN', $option);90 if (!defined('STACKSIGHT_PRIVATE_KEY') && $option) { 91 define('STACKSIGHT_PRIVATE_KEY', $option); 92 92 } 93 93 } … … 136 136 } 137 137 138 if(defined('STACKSIGHT_ TOKEN')){139 if(defined('STACKSIGHT_ APP_ID'))140 $this->ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_APP_ID);138 if(defined('STACKSIGHT_PRIVATE_KEY')){ 139 if(defined('STACKSIGHT_PUBLIC_KEY')) 140 $this->ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_PUBLIC_KEY); 141 141 else 142 $this->ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL);142 $this->ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL); 143 143 144 144 $handle_errors = FALSE; -
stacksight/tags/1.11.0/stacksight-php-sdk/bootstrap-magento-2.php
r1495173 r1553466 22 22 global $ss_client; 23 23 $this->ss_client = & $ss_client; 24 if(defined('STACKSIGHT_ TOKEN')){25 if(defined('STACKSIGHT_ APP_ID'))26 $this->ss_client = new \SSMagento2Client(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_MAGENTO_2, STACKSIGHT_APP_ID);24 if(defined('STACKSIGHT_PRIVATE_KEY')){ 25 if(defined('STACKSIGHT_PUBLIC_KEY')) 26 $this->ss_client = new \SSMagento2Client(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_MAGENTO_2, STACKSIGHT_PUBLIC_KEY); 27 27 else 28 $this->ss_client = new \SSMagento2Client(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_MAGENTO_2);28 $this->ss_client = new \SSMagento2Client(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_MAGENTO_2); 29 29 30 30 define('STACKSIGHT_BOOTSTRAPED', TRUE); -
stacksight/tags/1.11.0/stacksight-php-sdk/bootstrap-symfony-2.php
r1495173 r1553466 22 22 global $ss_client; 23 23 $this->ss_client = & $ss_client; 24 if(defined('STACKSIGHT_ TOKEN')){25 if(defined('STACKSIGHT_ APP_ID'))26 $this->ss_client = new \SSSymfony2Client(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_SYMFONY_2, STACKSIGHT_APP_ID);24 if(defined('STACKSIGHT_PRIVATE_KEY')){ 25 if(defined('STACKSIGHT_PUBLIC_KEY')) 26 $this->ss_client = new \SSSymfony2Client(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_SYMFONY_2, STACKSIGHT_PUBLIC_KEY); 27 27 else 28 $this->ss_client = new \SSSymfony2Client(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_SYMFONY_2);28 $this->ss_client = new \SSSymfony2Client(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_SYMFONY_2); 29 29 30 30 define('STACKSIGHT_BOOTSTRAPED', TRUE); -
stacksight/tags/1.11.0/stacksight-php-sdk/bootstrap-wp.php
r1495173 r1553466 63 63 public function init(){ 64 64 if($this->ready == true){ 65 define('STACKSIGHT_SETTINGS_IN_DB', true); 65 66 $defines_from_db = $this->defineVars(); 66 67 if(is_array($defines_from_db) && !empty($defines_from_db)){ … … 73 74 case '_id': 74 75 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true) { 75 if (!defined('STACKSIGHT_ APP_ID') && $option) {76 define('STACKSIGHT_ APP_ID', $option);76 if (!defined('STACKSIGHT_PUBLIC_KEY') && $option) { 77 define('STACKSIGHT_PUBLIC_KEY', $option); 77 78 } 78 79 } … … 80 81 case 'token': 81 82 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true) { 82 if (!defined('STACKSIGHT_ TOKEN') && $option) {83 define('STACKSIGHT_ TOKEN', $option);83 if (!defined('STACKSIGHT_PRIVATE_KEY') && $option) { 84 define('STACKSIGHT_PRIVATE_KEY', $option); 84 85 } 85 86 } … … 153 154 } 154 155 155 if(defined('STACKSIGHT_ TOKEN')){156 $app_id = (defined('STACKSIGHT_ APP_ID')) ? STACKSIGHT_APP_ID: false;156 if(defined('STACKSIGHT_PRIVATE_KEY')){ 157 $app_id = (defined('STACKSIGHT_PUBLIC_KEY')) ? STACKSIGHT_PUBLIC_KEY : false; 157 158 $group = (defined('STACKSIGHT_GROUP')) ? STACKSIGHT_GROUP : false; 158 159 // Enable slack integration … … 161 162 } 162 163 163 $ss_client = new SSWordpressClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_WORDPRESS, $app_id, $group);164 $ss_client = new SSWordpressClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_WORDPRESS, $app_id, $group); 164 165 if(defined('STACKSIGHT_INCLUDE_LOGS') && STACKSIGHT_INCLUDE_LOGS === true) { 165 166 new SSLogsTracker($ss_client); -
stacksight/tags/1.11.0/wp-stacksight.php
r1502175 r1553466 4 4 * Plugin URI: https://wordpress.org/plugins/stacksight/ 5 5 * Description: Stacksight wordpress support (featuring events, error logs and updates) 6 * Version: 1.1 0.56 * Version: 1.11.0 7 7 * Author: Stacksight LTD 8 8 * Author URI: http://stacksight.io … … 62 62 register_deactivation_hook( __FILE__, array(__CLASS__, 'uninstall')); 63 63 64 $this->_setUpMultidomainsConfig(array('STACKSIGHT_ APP_ID', 'STACKSIGHT_TOKEN', 'STACKSIGHT_GROUP'));64 $this->_setUpMultidomainsConfig(array('STACKSIGHT_PUBLIC_KEY', 'STACKSIGHT_PRIVATE_KEY', 'STACKSIGHT_GROUP')); 65 65 66 66 if(file_exists(ABSPATH .'wp-content/plugins/aryo-activity-log/aryo-activity-log.php')){ … … 74 74 } 75 75 76 if (defined('STACKSIGHT_ TOKEN') && defined('STACKSIGHT_BOOTSTRAPED')) {77 $app_id = (defined('STACKSIGHT_ APP_ID')) ? STACKSIGHT_APP_ID: false;76 if (defined('STACKSIGHT_PRIVATE_KEY') && defined('STACKSIGHT_BOOTSTRAPED')) { 77 $app_id = (defined('STACKSIGHT_PUBLIC_KEY')) ? STACKSIGHT_PUBLIC_KEY : false; 78 78 $group = (defined('STACKSIGHT_GROUP')) ? STACKSIGHT_GROUP : false; 79 $this->ss_client = new SSWordpressClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_WORDPRESS, $app_id, $group);79 $this->ss_client = new SSWordpressClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_WORDPRESS, $app_id, $group); 80 80 add_filter('cron_schedules', array($this, 'cron_custom_interval')); 81 81 if (function_exists('register_nav_menus')){ … … 378 378 public function cron_do_main_job($host = false) 379 379 { 380 if(!defined('STACKSIGHT_ TOKEN') || !isset($this->ss_client) || !$this->ss_client)380 if(!defined('STACKSIGHT_PRIVATE_KEY') || !isset($this->ss_client) || !$this->ss_client) 381 381 return; 382 382 … … 919 919 public function sends_all_data_admin_action() 920 920 { 921 if(defined('STACKSIGHT_ TOKEN') && STACKSIGHT_TOKEN){921 if(defined('STACKSIGHT_PRIVATE_KEY') && STACKSIGHT_PRIVATE_KEY){ 922 922 $last_running_time = get_option(self::LAST_SENDS_ALL_DATA); 923 923 if($last_running_time){ … … 1510 1510 ); 1511 1511 1512 if(defined('STACKSIGHT_ APP_ID')){1512 if(defined('STACKSIGHT_PUBLIC_KEY')){ 1513 1513 add_settings_field( 1514 1514 '_id', … … 1521 1521 1522 1522 $token_title = 'Access Token *'; 1523 if((defined('DOCS_URL') && DOCS_URL) && (!defined('STACKSIGHT_ TOKEN') || !STACKSIGHT_TOKEN)){1523 if((defined('DOCS_URL') && DOCS_URL) && (!defined('STACKSIGHT_PRIVATE_KEY') || !STACKSIGHT_PRIVATE_KEY)){ 1524 1524 $token_title .= '<a href="'.DOCS_URL.'" class="howto" target="_blank">How to set?</a>'; 1525 1525 } … … 1573 1573 $new_input = array(); 1574 1574 1575 if(!defined('STACKSIGHT_ TOKEN')) add_settings_error('token', 'token', '"App Acces Token" can not be empty');1575 if(!defined('STACKSIGHT_PRIVATE_KEY')) add_settings_error('token', 'token', '"App Acces Token" can not be empty'); 1576 1576 1577 1577 $any_errors = $this->any_form_errors(); … … 1712 1712 ); 1713 1713 } else{ 1714 if(!defined('STACKSIGHT_ APP_ID')){1714 if(!defined('STACKSIGHT_PUBLIC_KEY')){ 1715 1715 printf( 1716 1716 '<span class="pre-code-green"> Is calculated </span>' … … 1718 1718 } else { 1719 1719 printf( 1720 '<span>'.STACKSIGHT_ APP_ID.'</span>'1720 '<span>'.STACKSIGHT_PUBLIC_KEY.'</span>' 1721 1721 ); 1722 1722 } … … 1734 1734 ); 1735 1735 } else{ 1736 if(!defined('STACKSIGHT_ TOKEN')){1736 if(!defined('STACKSIGHT_PRIVATE_KEY')){ 1737 1737 printf( 1738 1738 '<span class="pre-code-red"> Not set </span>'.$link … … 1740 1740 } else { 1741 1741 printf( 1742 '<span>'.STACKSIGHT_ TOKEN.'</span><input type="hidden" name="stacksight_opt[token]" value="'.STACKSIGHT_TOKEN.'">'1742 '<span>'.STACKSIGHT_PRIVATE_KEY.'</span><input type="hidden" name="stacksight_opt[token]" value="'.STACKSIGHT_PRIVATE_KEY.'">' 1743 1743 ); 1744 1744 } … … 1887 1887 $show_code = false; 1888 1888 1889 if (!defined('STACKSIGHT_ TOKEN')) {1889 if (!defined('STACKSIGHT_PRIVATE_KEY')) { 1890 1890 $list[] = __('Token doesn\'t exist', 'stacksight').'<br>'; 1891 1891 $show_code = true; … … 2045 2045 'app' => $plugin_info, 2046 2046 'settings' => array( 2047 'app_id' => (defined('STACKSIGHT_ APP_ID')) ? STACKSIGHT_APP_ID: false,2048 'app_token' => (defined('STACKSIGHT_ TOKEN')) ? STACKSIGHT_TOKEN: false,2047 'app_id' => (defined('STACKSIGHT_PUBLIC_KEY')) ? STACKSIGHT_PUBLIC_KEY : false, 2048 'app_token' => (defined('STACKSIGHT_PRIVATE_KEY')) ? STACKSIGHT_PRIVATE_KEY : false, 2049 2049 'app_group' => (defined('STACKSIGHT_GROUP')) ? STACKSIGHT_GROUP : false, 2050 2050 'debug_mode' => (defined('STACKSIGHT_DEBUG')) ? STACKSIGHT_DEBUG : false -
stacksight/trunk/readme.txt
r1502175 r1553466 4 4 Requires at least: 3.5 5 5 Tested up to: 4.3 6 Stable tag: 1.1 0.56 Stable tag: 1.11.0 7 7 License: GPLv2 or later 8 8 … … 86 86 87 87 == Changelog == 88 = 1.11.0 = 89 - Save application settings in DB 90 88 91 = 1.10.5 = 89 92 - Fix compatibility with PHP < 5.5 -
stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-6.php
r1495173 r1553466 17 17 define('DOCS_URL', '#'); 18 18 19 if(defined('STACKSIGHT_ TOKEN')){20 if(defined('STACKSIGHT_ APP_ID'))21 $ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_APP_ID);19 if(defined('STACKSIGHT_PRIVATE_KEY')){ 20 if(defined('STACKSIGHT_PUBLIC_KEY')) 21 $ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_PUBLIC_KEY); 22 22 else 23 $ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL);23 $ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL); 24 24 $handle_errors = FALSE; 25 25 $handle_fatal_errors = TRUE; -
stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-7.php
r1495173 r1553466 94 94 case 'stacksight_app_id': 95 95 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true){ 96 if (!defined('STACKSIGHT_ APP_ID') && $option) {97 define('STACKSIGHT_ APP_ID', $option);96 if (!defined('STACKSIGHT_PUBLIC_KEY') && $option) { 97 define('STACKSIGHT_PUBLIC_KEY', $option); 98 98 } 99 99 } … … 101 101 case 'stacksight_token': 102 102 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true){ 103 if (!defined('STACKSIGHT_ TOKEN') && $option) {104 define('STACKSIGHT_ TOKEN', $option);103 if (!defined('STACKSIGHT_PRIVATE_KEY') && $option) { 104 define('STACKSIGHT_PRIVATE_KEY', $option); 105 105 } 106 106 } … … 148 148 } 149 149 150 if(defined('STACKSIGHT_ TOKEN')){151 if(defined('STACKSIGHT_ APP_ID'))152 $this->ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_APP_ID);150 if(defined('STACKSIGHT_PRIVATE_KEY')){ 151 if(defined('STACKSIGHT_PUBLIC_KEY')) 152 $this->ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_PUBLIC_KEY); 153 153 else 154 $this->ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL);154 $this->ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL); 155 155 156 156 $handle_errors = FALSE; -
stacksight/trunk/stacksight-php-sdk/bootstrap-drupal-8.php
r1495173 r1553466 81 81 case 'app_id': 82 82 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true) { 83 if (!defined('STACKSIGHT_ APP_ID') && $option) {84 define('STACKSIGHT_ APP_ID', $option);83 if (!defined('STACKSIGHT_PUBLIC_KEY') && $option) { 84 define('STACKSIGHT_PUBLIC_KEY', $option); 85 85 } 86 86 } … … 88 88 case 'token': 89 89 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true) { 90 if (!defined('STACKSIGHT_ TOKEN') && $option) {91 define('STACKSIGHT_ TOKEN', $option);90 if (!defined('STACKSIGHT_PRIVATE_KEY') && $option) { 91 define('STACKSIGHT_PRIVATE_KEY', $option); 92 92 } 93 93 } … … 136 136 } 137 137 138 if(defined('STACKSIGHT_ TOKEN')){139 if(defined('STACKSIGHT_ APP_ID'))140 $this->ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_APP_ID);138 if(defined('STACKSIGHT_PRIVATE_KEY')){ 139 if(defined('STACKSIGHT_PUBLIC_KEY')) 140 $this->ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL, STACKSIGHT_PUBLIC_KEY); 141 141 else 142 $this->ss_client = new SSDrupalClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_DRUPAL);142 $this->ss_client = new SSDrupalClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_DRUPAL); 143 143 144 144 $handle_errors = FALSE; -
stacksight/trunk/stacksight-php-sdk/bootstrap-magento-2.php
r1495173 r1553466 22 22 global $ss_client; 23 23 $this->ss_client = & $ss_client; 24 if(defined('STACKSIGHT_ TOKEN')){25 if(defined('STACKSIGHT_ APP_ID'))26 $this->ss_client = new \SSMagento2Client(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_MAGENTO_2, STACKSIGHT_APP_ID);24 if(defined('STACKSIGHT_PRIVATE_KEY')){ 25 if(defined('STACKSIGHT_PUBLIC_KEY')) 26 $this->ss_client = new \SSMagento2Client(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_MAGENTO_2, STACKSIGHT_PUBLIC_KEY); 27 27 else 28 $this->ss_client = new \SSMagento2Client(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_MAGENTO_2);28 $this->ss_client = new \SSMagento2Client(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_MAGENTO_2); 29 29 30 30 define('STACKSIGHT_BOOTSTRAPED', TRUE); -
stacksight/trunk/stacksight-php-sdk/bootstrap-symfony-2.php
r1495173 r1553466 22 22 global $ss_client; 23 23 $this->ss_client = & $ss_client; 24 if(defined('STACKSIGHT_ TOKEN')){25 if(defined('STACKSIGHT_ APP_ID'))26 $this->ss_client = new \SSSymfony2Client(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_SYMFONY_2, STACKSIGHT_APP_ID);24 if(defined('STACKSIGHT_PRIVATE_KEY')){ 25 if(defined('STACKSIGHT_PUBLIC_KEY')) 26 $this->ss_client = new \SSSymfony2Client(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_SYMFONY_2, STACKSIGHT_PUBLIC_KEY); 27 27 else 28 $this->ss_client = new \SSSymfony2Client(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_SYMFONY_2);28 $this->ss_client = new \SSSymfony2Client(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_SYMFONY_2); 29 29 30 30 define('STACKSIGHT_BOOTSTRAPED', TRUE); -
stacksight/trunk/stacksight-php-sdk/bootstrap-wp.php
r1495173 r1553466 63 63 public function init(){ 64 64 if($this->ready == true){ 65 define('STACKSIGHT_SETTINGS_IN_DB', true); 65 66 $defines_from_db = $this->defineVars(); 66 67 if(is_array($defines_from_db) && !empty($defines_from_db)){ … … 73 74 case '_id': 74 75 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true) { 75 if (!defined('STACKSIGHT_ APP_ID') && $option) {76 define('STACKSIGHT_ APP_ID', $option);76 if (!defined('STACKSIGHT_PUBLIC_KEY') && $option) { 77 define('STACKSIGHT_PUBLIC_KEY', $option); 77 78 } 78 79 } … … 80 81 case 'token': 81 82 if(defined('STACKSIGHT_SETTINGS_IN_DB') && STACKSIGHT_SETTINGS_IN_DB === true) { 82 if (!defined('STACKSIGHT_ TOKEN') && $option) {83 define('STACKSIGHT_ TOKEN', $option);83 if (!defined('STACKSIGHT_PRIVATE_KEY') && $option) { 84 define('STACKSIGHT_PRIVATE_KEY', $option); 84 85 } 85 86 } … … 153 154 } 154 155 155 if(defined('STACKSIGHT_ TOKEN')){156 $app_id = (defined('STACKSIGHT_ APP_ID')) ? STACKSIGHT_APP_ID: false;156 if(defined('STACKSIGHT_PRIVATE_KEY')){ 157 $app_id = (defined('STACKSIGHT_PUBLIC_KEY')) ? STACKSIGHT_PUBLIC_KEY : false; 157 158 $group = (defined('STACKSIGHT_GROUP')) ? STACKSIGHT_GROUP : false; 158 159 // Enable slack integration … … 161 162 } 162 163 163 $ss_client = new SSWordpressClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_WORDPRESS, $app_id, $group);164 $ss_client = new SSWordpressClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_WORDPRESS, $app_id, $group); 164 165 if(defined('STACKSIGHT_INCLUDE_LOGS') && STACKSIGHT_INCLUDE_LOGS === true) { 165 166 new SSLogsTracker($ss_client); -
stacksight/trunk/wp-stacksight.php
r1502175 r1553466 4 4 * Plugin URI: https://wordpress.org/plugins/stacksight/ 5 5 * Description: Stacksight wordpress support (featuring events, error logs and updates) 6 * Version: 1.1 0.56 * Version: 1.11.0 7 7 * Author: Stacksight LTD 8 8 * Author URI: http://stacksight.io … … 62 62 register_deactivation_hook( __FILE__, array(__CLASS__, 'uninstall')); 63 63 64 $this->_setUpMultidomainsConfig(array('STACKSIGHT_ APP_ID', 'STACKSIGHT_TOKEN', 'STACKSIGHT_GROUP'));64 $this->_setUpMultidomainsConfig(array('STACKSIGHT_PUBLIC_KEY', 'STACKSIGHT_PRIVATE_KEY', 'STACKSIGHT_GROUP')); 65 65 66 66 if(file_exists(ABSPATH .'wp-content/plugins/aryo-activity-log/aryo-activity-log.php')){ … … 74 74 } 75 75 76 if (defined('STACKSIGHT_ TOKEN') && defined('STACKSIGHT_BOOTSTRAPED')) {77 $app_id = (defined('STACKSIGHT_ APP_ID')) ? STACKSIGHT_APP_ID: false;76 if (defined('STACKSIGHT_PRIVATE_KEY') && defined('STACKSIGHT_BOOTSTRAPED')) { 77 $app_id = (defined('STACKSIGHT_PUBLIC_KEY')) ? STACKSIGHT_PUBLIC_KEY : false; 78 78 $group = (defined('STACKSIGHT_GROUP')) ? STACKSIGHT_GROUP : false; 79 $this->ss_client = new SSWordpressClient(STACKSIGHT_ TOKEN, SSClientBase::PLATFORM_WORDPRESS, $app_id, $group);79 $this->ss_client = new SSWordpressClient(STACKSIGHT_PRIVATE_KEY, SSClientBase::PLATFORM_WORDPRESS, $app_id, $group); 80 80 add_filter('cron_schedules', array($this, 'cron_custom_interval')); 81 81 if (function_exists('register_nav_menus')){ … … 378 378 public function cron_do_main_job($host = false) 379 379 { 380 if(!defined('STACKSIGHT_ TOKEN') || !isset($this->ss_client) || !$this->ss_client)380 if(!defined('STACKSIGHT_PRIVATE_KEY') || !isset($this->ss_client) || !$this->ss_client) 381 381 return; 382 382 … … 919 919 public function sends_all_data_admin_action() 920 920 { 921 if(defined('STACKSIGHT_ TOKEN') && STACKSIGHT_TOKEN){921 if(defined('STACKSIGHT_PRIVATE_KEY') && STACKSIGHT_PRIVATE_KEY){ 922 922 $last_running_time = get_option(self::LAST_SENDS_ALL_DATA); 923 923 if($last_running_time){ … … 1510 1510 ); 1511 1511 1512 if(defined('STACKSIGHT_ APP_ID')){1512 if(defined('STACKSIGHT_PUBLIC_KEY')){ 1513 1513 add_settings_field( 1514 1514 '_id', … … 1521 1521 1522 1522 $token_title = 'Access Token *'; 1523 if((defined('DOCS_URL') && DOCS_URL) && (!defined('STACKSIGHT_ TOKEN') || !STACKSIGHT_TOKEN)){1523 if((defined('DOCS_URL') && DOCS_URL) && (!defined('STACKSIGHT_PRIVATE_KEY') || !STACKSIGHT_PRIVATE_KEY)){ 1524 1524 $token_title .= '<a href="'.DOCS_URL.'" class="howto" target="_blank">How to set?</a>'; 1525 1525 } … … 1573 1573 $new_input = array(); 1574 1574 1575 if(!defined('STACKSIGHT_ TOKEN')) add_settings_error('token', 'token', '"App Acces Token" can not be empty');1575 if(!defined('STACKSIGHT_PRIVATE_KEY')) add_settings_error('token', 'token', '"App Acces Token" can not be empty'); 1576 1576 1577 1577 $any_errors = $this->any_form_errors(); … … 1712 1712 ); 1713 1713 } else{ 1714 if(!defined('STACKSIGHT_ APP_ID')){1714 if(!defined('STACKSIGHT_PUBLIC_KEY')){ 1715 1715 printf( 1716 1716 '<span class="pre-code-green"> Is calculated </span>' … … 1718 1718 } else { 1719 1719 printf( 1720 '<span>'.STACKSIGHT_ APP_ID.'</span>'1720 '<span>'.STACKSIGHT_PUBLIC_KEY.'</span>' 1721 1721 ); 1722 1722 } … … 1734 1734 ); 1735 1735 } else{ 1736 if(!defined('STACKSIGHT_ TOKEN')){1736 if(!defined('STACKSIGHT_PRIVATE_KEY')){ 1737 1737 printf( 1738 1738 '<span class="pre-code-red"> Not set </span>'.$link … … 1740 1740 } else { 1741 1741 printf( 1742 '<span>'.STACKSIGHT_ TOKEN.'</span><input type="hidden" name="stacksight_opt[token]" value="'.STACKSIGHT_TOKEN.'">'1742 '<span>'.STACKSIGHT_PRIVATE_KEY.'</span><input type="hidden" name="stacksight_opt[token]" value="'.STACKSIGHT_PRIVATE_KEY.'">' 1743 1743 ); 1744 1744 } … … 1887 1887 $show_code = false; 1888 1888 1889 if (!defined('STACKSIGHT_ TOKEN')) {1889 if (!defined('STACKSIGHT_PRIVATE_KEY')) { 1890 1890 $list[] = __('Token doesn\'t exist', 'stacksight').'<br>'; 1891 1891 $show_code = true; … … 2045 2045 'app' => $plugin_info, 2046 2046 'settings' => array( 2047 'app_id' => (defined('STACKSIGHT_ APP_ID')) ? STACKSIGHT_APP_ID: false,2048 'app_token' => (defined('STACKSIGHT_ TOKEN')) ? STACKSIGHT_TOKEN: false,2047 'app_id' => (defined('STACKSIGHT_PUBLIC_KEY')) ? STACKSIGHT_PUBLIC_KEY : false, 2048 'app_token' => (defined('STACKSIGHT_PRIVATE_KEY')) ? STACKSIGHT_PRIVATE_KEY : false, 2049 2049 'app_group' => (defined('STACKSIGHT_GROUP')) ? STACKSIGHT_GROUP : false, 2050 2050 'debug_mode' => (defined('STACKSIGHT_DEBUG')) ? STACKSIGHT_DEBUG : false
Note: See TracChangeset
for help on using the changeset viewer.