Changeset 1751911
- Timestamp:
- 10/24/2017 02:17:38 PM (8 years ago)
- Location:
- ithemes-sync
- Files:
-
- 2 added
- 14 edited
- 1 copied
-
tags/2.0.3 (copied) (copied from ithemes-sync/trunk)
-
tags/2.0.3/api.php (modified) (2 diffs)
-
tags/2.0.3/history.txt (modified) (1 diff)
-
tags/2.0.3/init.php (modified) (1 diff)
-
tags/2.0.3/lang/ithemes-sync.pot (modified) (3 diffs)
-
tags/2.0.3/readme.txt (modified) (2 diffs)
-
tags/2.0.3/request-handler.php (modified) (2 diffs)
-
tags/2.0.3/settings.php (modified) (2 diffs)
-
tags/2.0.3/verbs/manage-site.php (added)
-
trunk/api.php (modified) (2 diffs)
-
trunk/history.txt (modified) (1 diff)
-
trunk/init.php (modified) (1 diff)
-
trunk/lang/ithemes-sync.pot (modified) (3 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/request-handler.php (modified) (2 diffs)
-
trunk/settings.php (modified) (2 diffs)
-
trunk/verbs/manage-site.php (added)
Legend:
- Unmodified
- Added
- Removed
-
ithemes-sync/tags/2.0.3/api.php
r1669854 r1751911 66 66 'manage-reports' => 'Ithemes_Sync_Verb_Manage_Reports', 67 67 'manage-roles' => 'Ithemes_Sync_Verb_Manage_Roles', 68 'manage-site' => 'Ithemes_Sync_Verb_Manage_Site', 68 69 'manage-themes' => 'Ithemes_Sync_Verb_Manage_Themes', 69 70 'manage-users' => 'Ithemes_Sync_Verb_Manage_Users', … … 74 75 75 76 public function __construct() { 77 @ini_set( 'display_errors', 0 ); 78 76 79 $GLOBALS['ithemes-sync-api'] = $this; 77 80 -
ithemes-sync/tags/2.0.3/history.txt
r1682607 r1751911 185 185 2.0.1 - 2017-06-21 - Lew Ayotte 186 186 Bug Fix: Adding code to get-authentication-token verb to set the scheme to https by default if it should be 187 2.0.3 - 2017-09-26 - Glenn Ansley 188 Improvement: Refactored verbs to improve add-site function from Sync Dashboard. -
ithemes-sync/tags/2.0.3/init.php
r1682607 r1751911 5 5 Description: Manage updates to your WordPress sites easily in one place. 6 6 Author: iThemes 7 Version: 2.0. 17 Version: 2.0.3 8 8 Author URI: http://ithemes.com/ 9 9 Domain Path: /lang/ -
ithemes-sync/tags/2.0.3/lang/ithemes-sync.pot
r1682607 r1751911 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: iThemes Sync 2.0. 1\n"5 "Project-Id-Version: iThemes Sync 2.0.3\n" 6 6 "Report-Msgid-Bugs-To: http://ithemes.com/support/\n" 7 "POT-Creation-Date: 2017-0 6-21 12:49:59+00:00\n"7 "POT-Creation-Date: 2017-09-26 14:04:28+00:00\n" 8 8 "PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n" 9 9 "MIME-Version: 1.0\n" … … 36 36 msgstr "" 37 37 38 #. #-#-#-#-# ithemes-sync.pot (iThemes Sync 2.0. 1) #-#-#-#-#38 #. #-#-#-#-# ithemes-sync.pot (iThemes Sync 2.0.3) #-#-#-#-# 39 39 #. Plugin Name of the plugin/theme 40 40 #: admin.php:168 admin.php:174 settings-page.php:268 … … 546 546 msgstr "" 547 547 548 #: settings.php:13 1548 #: settings.php:133 549 549 msgid "" 550 550 "The user is not authenticated. Could not remove authentication for the user." 551 551 msgstr "" 552 552 553 #: settings.php:19 7553 #: settings.php:199 554 554 msgid "" 555 555 "A valid user was unable to be found. A valid user is required in order to do " -
ithemes-sync/tags/2.0.3/readme.txt
r1711026 r1751911 4 4 Requires at least: 4.5 5 5 Tested up to: 4.8 6 Stable tag: 2.0. 16 Stable tag: 2.0.3 7 7 License: GPLv3 or later 8 8 License URI: http://www.gnu.org/licenses/quick-guide-gplv3.html … … 87 87 == Changelog == 88 88 89 = 2.0.3 = 90 * Refactored verbs to improve add-site function from Sync Dashboard 91 92 = 2.0.2 = 93 * Turning of PHP Errors when doing AJAX, like WP does 94 89 95 = 2.0.1 = 90 96 * Adding code to get-authentication-token verb to set the scheme to https by default if it should be -
ithemes-sync/tags/2.0.3/request-handler.php
r1669854 r1751911 229 229 230 230 private function parse_request( $request ) { 231 if ( empty( $this->options['authentications'] ) ) { 231 232 if ( empty( $this->options['authentications'] ) && ( ! empty( $request['action'] ) && 'manage-site' != $request['action'] ) ) { 232 233 $this->send_response( new WP_Error( 'site-not-authenticated', 'The site does not have any authenticated users.' ) ); 233 234 } … … 247 248 $this->send_response( new WP_Error( "missing-var-$index", 'Invalid request.' ) ); 248 249 } 250 } 251 252 // If action is manage-site, stop here 253 if ( 'manage-site' == $request['action'] ) { 254 return; 249 255 } 250 256 -
ithemes-sync/tags/2.0.3/settings.php
r1669854 r1751911 90 90 } 91 91 92 public function add_authentication( $user_id, $username, $key ) { 93 $this->init(); 94 92 public function add_authentication( $sync_site_id, $ithemes_username, $key, $wp_user_login = false ) { 93 $this->init(); 95 94 96 95 if ( ! isset( $this->options['authentications'] ) || ! is_array( $this->options['authentications'] ) ) { … … 98 97 } 99 98 100 $local_user = wp_get_current_user(); 101 102 $this->options['authentications'][$user_id] = array( 99 if ( empty( $wp_user_login ) ) { 100 $local_user = wp_get_current_user(); 101 $wp_user_login = $local_user->user_login; 102 } 103 104 $this->options['authentications'][$sync_site_id] = array( 103 105 'key' => $key, 104 106 'timestamp' => time(), 105 'local_user' => $ local_user->user_login,106 'username' => $ username,107 'local_user' => $wp_user_login, 108 'username' => $ithemes_username, 107 109 ); 108 110 -
ithemes-sync/trunk/api.php
r1669854 r1751911 66 66 'manage-reports' => 'Ithemes_Sync_Verb_Manage_Reports', 67 67 'manage-roles' => 'Ithemes_Sync_Verb_Manage_Roles', 68 'manage-site' => 'Ithemes_Sync_Verb_Manage_Site', 68 69 'manage-themes' => 'Ithemes_Sync_Verb_Manage_Themes', 69 70 'manage-users' => 'Ithemes_Sync_Verb_Manage_Users', … … 74 75 75 76 public function __construct() { 77 @ini_set( 'display_errors', 0 ); 78 76 79 $GLOBALS['ithemes-sync-api'] = $this; 77 80 -
ithemes-sync/trunk/history.txt
r1682607 r1751911 185 185 2.0.1 - 2017-06-21 - Lew Ayotte 186 186 Bug Fix: Adding code to get-authentication-token verb to set the scheme to https by default if it should be 187 2.0.3 - 2017-09-26 - Glenn Ansley 188 Improvement: Refactored verbs to improve add-site function from Sync Dashboard. -
ithemes-sync/trunk/init.php
r1682607 r1751911 5 5 Description: Manage updates to your WordPress sites easily in one place. 6 6 Author: iThemes 7 Version: 2.0. 17 Version: 2.0.3 8 8 Author URI: http://ithemes.com/ 9 9 Domain Path: /lang/ -
ithemes-sync/trunk/lang/ithemes-sync.pot
r1682607 r1751911 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: iThemes Sync 2.0. 1\n"5 "Project-Id-Version: iThemes Sync 2.0.3\n" 6 6 "Report-Msgid-Bugs-To: http://ithemes.com/support/\n" 7 "POT-Creation-Date: 2017-0 6-21 12:49:59+00:00\n"7 "POT-Creation-Date: 2017-09-26 14:04:28+00:00\n" 8 8 "PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n" 9 9 "MIME-Version: 1.0\n" … … 36 36 msgstr "" 37 37 38 #. #-#-#-#-# ithemes-sync.pot (iThemes Sync 2.0. 1) #-#-#-#-#38 #. #-#-#-#-# ithemes-sync.pot (iThemes Sync 2.0.3) #-#-#-#-# 39 39 #. Plugin Name of the plugin/theme 40 40 #: admin.php:168 admin.php:174 settings-page.php:268 … … 546 546 msgstr "" 547 547 548 #: settings.php:13 1548 #: settings.php:133 549 549 msgid "" 550 550 "The user is not authenticated. Could not remove authentication for the user." 551 551 msgstr "" 552 552 553 #: settings.php:19 7553 #: settings.php:199 554 554 msgid "" 555 555 "A valid user was unable to be found. A valid user is required in order to do " -
ithemes-sync/trunk/readme.txt
r1711026 r1751911 4 4 Requires at least: 4.5 5 5 Tested up to: 4.8 6 Stable tag: 2.0. 16 Stable tag: 2.0.3 7 7 License: GPLv3 or later 8 8 License URI: http://www.gnu.org/licenses/quick-guide-gplv3.html … … 87 87 == Changelog == 88 88 89 = 2.0.3 = 90 * Refactored verbs to improve add-site function from Sync Dashboard 91 92 = 2.0.2 = 93 * Turning of PHP Errors when doing AJAX, like WP does 94 89 95 = 2.0.1 = 90 96 * Adding code to get-authentication-token verb to set the scheme to https by default if it should be -
ithemes-sync/trunk/request-handler.php
r1669854 r1751911 229 229 230 230 private function parse_request( $request ) { 231 if ( empty( $this->options['authentications'] ) ) { 231 232 if ( empty( $this->options['authentications'] ) && ( ! empty( $request['action'] ) && 'manage-site' != $request['action'] ) ) { 232 233 $this->send_response( new WP_Error( 'site-not-authenticated', 'The site does not have any authenticated users.' ) ); 233 234 } … … 247 248 $this->send_response( new WP_Error( "missing-var-$index", 'Invalid request.' ) ); 248 249 } 250 } 251 252 // If action is manage-site, stop here 253 if ( 'manage-site' == $request['action'] ) { 254 return; 249 255 } 250 256 -
ithemes-sync/trunk/settings.php
r1669854 r1751911 90 90 } 91 91 92 public function add_authentication( $user_id, $username, $key ) { 93 $this->init(); 94 92 public function add_authentication( $sync_site_id, $ithemes_username, $key, $wp_user_login = false ) { 93 $this->init(); 95 94 96 95 if ( ! isset( $this->options['authentications'] ) || ! is_array( $this->options['authentications'] ) ) { … … 98 97 } 99 98 100 $local_user = wp_get_current_user(); 101 102 $this->options['authentications'][$user_id] = array( 99 if ( empty( $wp_user_login ) ) { 100 $local_user = wp_get_current_user(); 101 $wp_user_login = $local_user->user_login; 102 } 103 104 $this->options['authentications'][$sync_site_id] = array( 103 105 'key' => $key, 104 106 'timestamp' => time(), 105 'local_user' => $ local_user->user_login,106 'username' => $ username,107 'local_user' => $wp_user_login, 108 'username' => $ithemes_username, 107 109 ); 108 110
Note: See TracChangeset
for help on using the changeset viewer.