← All changes
|
modules/api-backups/classes/class-api-backups-utility.php
+16
-4
6.1.1
→
6.2.1
View file →
| @@ -582,10 +582,11 @@ | ||
| 582 | 582 | * Encrypt data. |
| 583 | 583 | * |
| 584 | 584 | * @param string $name name data. |
| 585 | 585 | * @param string $def_val default data. |
| 586 | + * @param string $opt_name Option name. | |
| 586 | 587 | */ |
| 587 | - public function get_api_key( $name, $def_val = '' ) { | |
| 588 | + public function get_api_key( $name, $def_val = '', $opt_name = '' ) { | |
| 588 | 589 | |
| 589 | 590 | $names = array( |
| 590 | 591 | 'vultr', |
| 591 | 592 | 'gridpane', |
| @@ -600,9 +601,14 @@ | ||
| 600 | 601 | if ( ! in_array( $name, $names ) ) { |
| 601 | 602 | return $def_val; |
| 602 | 603 | } |
| 603 | 604 | |
| 604 | - $encrypted = get_option( 'mainwp_api_backups_' . $name . '_api_key' ); | |
| 605 | + if ( ! empty( $opt_name ) ) { | |
| 606 | + $encrypted = get_option( 'mainwp_api_backups_' . $name . '_' . (string) $opt_name ); | |
| 607 | + } else { | |
| 608 | + $encrypted = get_option( 'mainwp_api_backups_' . $name . '_api_key' ); | |
| 609 | + } | |
| 610 | + | |
| 605 | 611 | if ( is_array( $encrypted ) && ! empty( $encrypted['file_key'] ) ) { |
| 606 | 612 | $key = $this->decrypt_api_keys( $encrypted ); |
| 607 | 613 | if ( ! empty( $key ) && is_string( $key ) ) { |
| 608 | 614 | return $key; |
| @@ -617,10 +623,11 @@ | ||
| 617 | 623 | * Encrypt data. |
| 618 | 624 | * |
| 619 | 625 | * @param string $name name data. |
| 620 | 626 | * @param string $value value data. |
| 627 | + * @param string $opt_name Option name. | |
| 621 | 628 | */ |
| 622 | - public function update_api_key( $name, $value ) { | |
| 629 | + public function update_api_key( $name, $value, $opt_name = '' ) { | |
| 623 | 630 | |
| 624 | 631 | $names = array( |
| 625 | 632 | 'vultr', |
| 626 | 633 | 'gridpane', |
| @@ -643,9 +650,14 @@ | ||
| 643 | 650 | if ( MainWP_Credential_Render::is_sentinel( $value ) ) { |
| 644 | 651 | return true; |
| 645 | 652 | } |
| 646 | 653 | |
| 647 | - $opt_name = 'mainwp_api_backups_' . $name . '_api_key'; | |
| 654 | + if ( ! empty( $opt_name ) ) { | |
| 655 | + $opt_name = 'mainwp_api_backups_' . $name . '_' . (string) $opt_name; | |
| 656 | + } else { | |
| 657 | + $opt_name = 'mainwp_api_backups_' . $name . '_api_key'; | |
| 658 | + } | |
| 659 | + | |
| 648 | 660 | $current = get_option( $opt_name ); |
| 649 | 661 | $key_file = ''; |
| 650 | 662 | |
| 651 | 663 | if ( is_array( $current ) && ! empty( $current['file_key'] ) ) { |