Changeset 1276630
- Timestamp:
- 10/30/2015 09:12:21 PM (10 years ago)
- Location:
- motaword/trunk
- Files:
-
- 8 edited
-
README.txt (modified) (2 diffs)
-
admin/class-motaword-admin.php (modified) (45 diffs)
-
admin/js/motaword-admin.js (modified) (2 diffs)
-
includes/class-motaword-api.php (modified) (19 diffs)
-
includes/class-motaword-db.php (modified) (5 diffs)
-
motaword.php (modified) (1 diff)
-
public/class-motaword-public.php (modified) (6 diffs)
-
uninstall.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
motaword/trunk/README.txt
r1273964 r1276630 5 5 Requires at least: 3.0.1 6 6 Tested up to: 4.3.1 7 Stable tag: 1. 07 Stable tag: 1.1.0 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 65 65 == Changelog == 66 66 67 = 1.0 = 67 = 1.1.0 = 68 * Improved content handling by switching from JSON-only to JSON and HTML files. This allows better quotes and TM management for complex post contents. 69 * Various stability improvements in API access and WordPress cache management. 70 71 = 1.0.0 = 68 72 * Initial version. 69 73 70 74 == Upgrade Notice == 71 75 72 . 73 74 75 76 = 1.1.0 = 77 Upgrading to version 1.1.0 is HIGHLY RECOMMENDED. It provides fundamental changes with API interaction. -
motaword/trunk/admin/class-motaword-admin.php
r1271940 r1276630 64 64 * to this: 65 65 * http://prntscr.com/8o10kd 66 * 66 67 * @var array 67 68 */ … … 70 71 /** 71 72 * Should we exit when an error occurs? If we exit, we will out print our logo image. 73 * 72 74 * @var bool 73 75 */ … … 75 77 /** 76 78 * When true, we will show an error icon instead of a message. This icon will have the message as a title. 79 * 77 80 * @var bool 78 81 */ … … 105 108 * 106 109 * @param string $motaword The name of this plugin. 107 * @param string $version The version of this plugin.110 * @param string $version The version of this plugin. 108 111 */ 109 112 public function __construct( $motaword, $version ) { … … 119 122 } 120 123 121 if (!!get_option( static::$options['sandbox'] ) || !!get_site_option( static::$options['sandbox'] )) {122 MotaWord_DB::$meta_prefix = MotaWord_DB::$meta_prefix .'sandbox_';124 if ( ! ! get_option( static::$options['sandbox'] ) || ! ! get_site_option( static::$options['sandbox'] ) ) { 125 MotaWord_DB::$meta_prefix = MotaWord_DB::$meta_prefix . 'sandbox_'; 123 126 } 124 127 } … … 128 131 */ 129 132 public function enqueue_styles() { 130 wp_enqueue_style( $this->motaword, plugin_dir_url( __FILE__ ) . 'css/motaword-admin.css', array(), $this->version, 'all' ); 133 wp_enqueue_style( $this->motaword, plugin_dir_url( __FILE__ ) . 'css/motaword-admin.css', array(), 134 $this->version, 'all' ); 131 135 } 132 136 … … 135 139 */ 136 140 public function enqueue_scripts() { 137 wp_enqueue_script( $this->motaword, plugin_dir_url( __FILE__ ) . 'js/motaword-admin.js', array('jquery'), $this->version, false ); 141 wp_enqueue_script( $this->motaword, plugin_dir_url( __FILE__ ) . 'js/motaword-admin.js', array( 'jquery' ), 142 $this->version, false ); 138 143 } 139 144 … … 213 218 if ( ! ! isset( $progress['languages'] ) ) { 214 219 $targetLanguages = array_filter( $targetLanguages, function ( $language ) use ( $progress ) { 215 if ( ( in_array( $language->code, $progress['languages'] )216 || @$progress['projects'][0]->source_language === $language->code )220 if ( ( in_array( $language->code, 221 $progress['languages'] ) || @$progress['projects'][0]->source_language === $language->code ) 217 222 ) { 218 223 return false; … … 240 245 $pll_mw_languages = array_map( array( $this, 'mapLanguageCode' ), $pll_languages ); 241 246 242 $targetLanguages = array_filter( $targetLanguages, function ( $language ) use ( $progress, $pll_mw_languages ) { 243 if ( ! in_array( $language->code, $pll_mw_languages ) ) { 244 return false; 245 } 246 247 return true; 248 } ); 247 $targetLanguages = array_filter( $targetLanguages, 248 function ( $language ) use ( $progress, $pll_mw_languages ) { 249 if ( ! in_array( $language->code, $pll_mw_languages ) ) { 250 return false; 251 } 252 253 return true; 254 } ); 249 255 250 256 // If there is left no other languages supported by Polylang configuration to translate... … … 252 258 253 259 if ( ! $progress ) { 254 echo '<div class="mw_warning">' . __( 'Save this post in order to send to MotaWord for translation.', 'motaword' ) . '</div>'; 260 echo '<div class="mw_warning">' . __( 'Save this post in order to send to MotaWord for translation.', 261 'motaword' ) . '</div>'; 255 262 } else { 256 263 echo $progress['html']; … … 273 280 echo '<input type="hidden" name="post_ids" id="post_ids" value="' . $wpPostId . '"/>'; 274 281 275 $targetBox = '<select id="mw_target_language" name="target_language" style="' . ( $this->showSourceLanguage ? 'width:115px;' : 'width: 100%;' ) . '">'; 282 $targetBox = '<select id="mw_target_language" name="target_language" style="' . ( $this->showSourceLanguage 283 ? 'width:115px;' : 'width: 100%;' ) . '">'; 276 284 $targetSelected = false; 277 285 … … 285 293 286 294 if ( ! $targetSelected && $code !== $mainSourceLanguage ) { 287 $targetBox .= '<option value="' . $code . '" selected="selected">' . __( $name, 'motaword' ) . '</option>'; 295 $targetBox .= '<option value="' . $code . '" selected="selected">' . __( $name, 296 'motaword' ) . '</option>'; 288 297 $targetSelected = true; 289 298 } else { … … 305 314 306 315 if ( ! ! $mainSourceLanguage && $code === $mainSourceLanguage ) { 307 $sourceBox .= '<option value="' . $code . '" selected="selected">' . __( $name, 'motaword' ) . '</option>'; 316 $sourceBox .= '<option value="' . $code . '" selected="selected">' . __( $name, 317 'motaword' ) . '</option>'; 308 318 } else { 309 319 $sourceBox .= '<option value="' . $code . '">' . __( $name, 'motaword' ) . '</option>'; … … 319 329 } 320 330 321 echo '<p style="text-align: center;"><a id="mw_start_link" href="' . plugin_dir_url( __FILE__ ) . 'get_quote.php" class="thickbox button button-primary button-large">' . __( 'Send to MotaWord', 'motaword' ) . '</a></p>'; 331 echo '<p style="text-align: center;"><a id="mw_start_link" href="' . plugin_dir_url( __FILE__ ) . 'get_quote.php" class="thickbox button button-primary button-large">' . __( 'Send to MotaWord', 332 'motaword' ) . '</a></p>'; 322 333 323 334 if ( ! ! $progress && isset( $progress['html'] ) && ! ! $progress['html'] ) { … … 350 361 echo '<input name="pllMainPostTitle" id="pllMainPostTitle" type="hidden" value="' . $originalTitle . '" />'; 351 362 echo '<input name="pllNewPostTitle" id="pllNewPostTitle" type="hidden" value="' . $newTitle . '" />'; 352 echo '<div class="mw_warning">' . __( 'Save this post in order to send to MotaWord for translation.', 'motaword' ) . '</div>'; 363 echo '<div class="mw_warning">' . __( 'Save this post in order to send to MotaWord for translation.', 364 'motaword' ) . '</div>'; 353 365 } else { 354 366 // ===> New Post Page 355 echo '<div class="mw_warning">' . __( 'Save this post in order to send to MotaWord for translation.', 'motaword' ) . '</div>'; 367 echo '<div class="mw_warning">' . __( 'Save this post in order to send to MotaWord for translation.', 368 'motaword' ) . '</div>'; 356 369 } 357 370 … … 365 378 366 379 protected function credentials_error() { 367 $this->issue_error( sprintf( 368 __( 'MotaWord API credentials that you provided are wrong. Please check them on <a href="%s">settings page</a>.', 'motaword' ), 369 admin_url( 'options-general.php?page=motaword' ) 370 ) ); 380 $this->issue_error( sprintf( __( 'MotaWord API credentials that you provided are wrong. Please check them on <a href="%s">settings page</a>.', 381 'motaword' ), admin_url( 'options-general.php?page=motaword' ) ) ); 371 382 } 372 383 373 384 protected function issue_error( $message = null ) { 374 385 if ( ! $message ) { 375 $message = __( 'We encountered an error while processing your request. Please try again or contact us at [email protected].', 'motaword' ); 386 $message = __( 'We encountered an error while processing your request. Please try again or contact us at [email protected].', 387 'motaword' ); 376 388 } 377 389 … … 416 428 } 417 429 418 $this->api = new MotaWord_API( $motawordPlugin->getOption( static::$options['client_id'] ), $motawordPlugin->getOption( static::$options['client_secret'] ), 430 $this->api = new MotaWord_API( $motawordPlugin->getOption( static::$options['client_id'] ), 431 $motawordPlugin->getOption( static::$options['client_secret'] ), 419 432 $motawordPlugin->getOption( static::$options['sandbox'] ) ); 420 433 … … 495 508 $htmlProgress .= ' 496 509 <div class="mwProgress"> 497 <p style="text-align: center; font-weight: bold;">' . 498 sprintf( 499 __( 'From %1$s to %2$s', 'motaword' ), 500 __( MotaWord_i18n::getLanguage( $projectDetail->source_language ), 'motaword' ), 501 implode( ', ', $targetLanguages ) 502 ) . ' 510 <p style="text-align: center; font-weight: bold;">' . sprintf( __( 'From %1$s to %2$s', 511 'motaword' ), __( MotaWord_i18n::getLanguage( $projectDetail->source_language ), 'motaword' ), 512 implode( ', ', $targetLanguages ) ) . ' 503 513 </p>'; 504 514 … … 507 517 } else { 508 518 if ( (int) $projectProgress->translation < 100 ) { 509 $htmlProgress .= '<p>' . sprintf( 510 __( 'Translation progress: <strong>%d</strong>%%', 'motaword' ), 511 $projectProgress->translation 512 ) . '</p>'; 519 $htmlProgress .= '<p>' . sprintf( __( 'Translation progress: <strong>%d</strong>%%', 'motaword' ), 520 $projectProgress->translation ) . '</p>'; 513 521 } else { 514 522 if ( (int) $projectProgress->proofreading < 100 ) { 515 $htmlProgress .= '<div class="mwProgress">' . sprintf( 516 __( 'Translated and currently being proofread: <strong>%d</strong>%% completed.', 'motaword' ), 517 $projectProgress->proofreading 518 ) . '</div>'; 523 $htmlProgress .= '<div class="mwProgress">' . sprintf( __( 'Translated and currently being proofread: <strong>%d</strong>%% completed.', 524 'motaword' ), $projectProgress->proofreading ) . '</div>'; 519 525 } else { 520 $htmlProgress .= '<div class="mwProgress">' . __( 'Completed. Waiting to be finalized.', 'motaword' ) . '</div>'; 526 $htmlProgress .= '<div class="mwProgress">' . __( 'Completed. Waiting to be finalized.', 527 'motaword' ) . '</div>'; 521 528 } 522 529 } 523 530 } 524 531 525 $htmlProgress .= '<p style="text-align: right;"><em><small>' . 526 sprintf( 527 __( 'Translation by <a href="%s" target="_blank">MotaWord</a>', 'motaword' ), 528 'https://www.motaword.com' 529 ) 530 . '</small></em></p></div>'; 532 $htmlProgress .= '<p style="text-align: right;"><em><small>' . sprintf( __( 'Translation by <a href="%s" target="_blank">MotaWord</a>', 533 'motaword' ), 'https://www.motaword.com' ) . '</small></em></p></div>'; 531 534 532 535 if ( ( $i + 1 ) < count( $projects ) ) { … … 586 589 */ 587 590 protected function get_cache( $category, $identifier = null ) { 588 if ( ! isset( $category ) || ! $category 589 || ! isset( $this->cache[ $category ] ) 590 || ( isset( $identifier ) 591 && ( ! $identifier || ! isset( $this->cache[ $category ][ $identifier ] ) ) ) 592 ) { 591 if ( ! isset( $category ) || ! $category || ! isset( $this->cache[ $category ] ) || ( isset( $identifier ) && ( ! $identifier || ! isset( $this->cache[ $category ][ $identifier ] ) ) ) ) { 593 592 return false; 594 593 } … … 607 606 * 608 607 * @param string $category 609 * @param mixed $identifier610 * @param mixed $value608 * @param mixed $identifier 609 * @param mixed $value 611 610 * 612 611 * @return bool … … 640 639 include_once __DIR__ . "/../includes/language-map.php"; 641 640 642 if ( isset( $map ) ) {643 $this->languages 644 } 645 646 if ( isset( $reversedMap ) ) {641 if ( isset( $map ) ) { 642 $this->languages = $map; 643 } 644 645 if ( isset( $reversedMap ) ) { 647 646 $this->reversedLanguages = $reversedMap; 648 647 } … … 662 661 663 662 public function register_network_settings() { 664 add_submenu_page( 'settings.php', __('MotaWord Settings', 'motaword'), 'MotaWord', 'manage_network_plugins', 'motaword', array($this, 'network_settings')); 663 add_submenu_page( 'settings.php', __( 'MotaWord Settings', 'motaword' ), 'MotaWord', 'manage_network_plugins', 664 'motaword', array( $this, 'network_settings' ) ); 665 665 } 666 666 … … 679 679 680 680 $defaultType = 'json'; 681 $wpPostIds = isset($_REQUEST['post_ids']) ? $_REQUEST['post_ids'] : array(); 682 $sourceLang = isset($_REQUEST['source_language']) ? sanitize_text_field( $_REQUEST['source_language'] ) : null; 683 $targetLang = isset($_REQUEST['target_language']) ? sanitize_text_field( $_REQUEST['target_language'] ) : null; 684 $pllMainPostID = isset($_REQUEST['pllMainPostID']) ? sanitize_text_field( $_REQUEST['pllMainPostID'] ) : null; 681 $wpPostIds = isset( $_REQUEST['post_ids'] ) ? $_REQUEST['post_ids'] : array(); 682 $sourceLang = isset( $_REQUEST['source_language'] ) ? sanitize_text_field( $_REQUEST['source_language'] ) 683 : null; 684 $targetLang = isset( $_REQUEST['target_language'] ) ? sanitize_text_field( $_REQUEST['target_language'] ) 685 : null; 686 $pllMainPostID = isset( $_REQUEST['pllMainPostID'] ) ? sanitize_text_field( $_REQUEST['pllMainPostID'] ) : null; 685 687 686 688 $mwApiHelper = $this->getAPI(); … … 708 710 $wpPostId = sanitize_text_field( $wpPostId ); 709 711 // Get from main post 710 if ( $this->isPolylang && ! empty( $pllMainPostID ) && (int) $pllMainPostID > 0 ) {712 if ( $this->isPolylang && ! empty( $pllMainPostID ) && (int) $pllMainPostID > 0 ) { 711 713 $wpPostTitle = get_the_title( $pllMainPostID ); 712 714 $content_post = get_post( $pllMainPostID ); … … 719 721 $wpPostContent = $content_post->post_content; 720 722 $thePostExcerpt = $content_post->post_excerpt; 721 $wpPostContent = apply_filters( 'the_content', $wpPostContent );722 723 $wpPostContent = str_replace( ']]>', ']]>', $wpPostContent ); 723 724 724 $temp = tmpfile(); 725 726 $data = array( 727 'TITLE' => $wpPostTitle, 728 'CONTENT' => $wpPostContent, 729 'EXCERPT' => $thePostExcerpt 730 ); 731 732 // Handle Custom Fields 725 // HTML files that are sent as individual files. 726 $files = array(); 727 // Value fields that are gathered together in a single value=>key file. 728 $fields = array(); 729 730 // Title 731 if ( strlen( $wpPostTitle ) > 0 ) { 732 $fields['TITLE'] = $wpPostTitle; 733 } 734 735 // Excerpt 736 if ( strlen( $thePostExcerpt ) > 0 ) { 737 if ( $thePostExcerpt === strip_tags( $thePostExcerpt ) ) { 738 $fields['EXCERPT'] = $thePostExcerpt; 739 } else { 740 $files['EXCERPT'] = $this->createHTMLFile( $thePostExcerpt ); 741 } 742 } 743 744 // Content 745 if ( strlen( $wpPostContent ) > 0 ) { 746 if ( $wpPostContent === strip_tags( $wpPostContent ) ) { 747 $fields['CONTENT'] = $wpPostContent; 748 } else { 749 $files['CONTENT'] = $this->createHTMLFile( $wpPostContent ); 750 } 751 } 752 753 // Custom fields 733 754 $wpPostCustomFields = get_post_meta( $thePostId, false ); 734 755 735 756 foreach ( $wpPostCustomFields as $key => $value ) { 736 if ( $key != "_edit_lock" && $key != "_edit_last" ) { 737 $data[ 'CUSTOMFIELD_' . $key ] = $value[0]; 738 } 739 } 740 741 // Handle Attached Media 742 $attachments = get_posts( array( 743 'post_parent' => $thePostId, 744 'post_type' => 'attachment', 745 'posts_per_page' => - 1, 746 'orderby' => 'menu_order', 747 'order' => 'ASC', 748 ) ); 749 750 if ( ! ! $attachments ) { 751 foreach ( $attachments as $attachment ) { 752 $alt = get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ); 753 754 $data[ 'ATTACHMENT_' . $attachment->ID . '_TITLE' ] = $attachment->post_title; 755 $data[ 'ATTACHMENT_' . $attachment->ID . '_EXCERPT' ] = $attachment->post_excerpt; 756 757 if ( ! ! $alt ) { 758 $data[ 'ATTACHMENT_' . $attachment->ID . '_ALT' ] = $alt; 757 if ( ! isset( $value[0] ) || strlen( $value[0] ) < 1 ) { 758 continue; 759 } 760 761 $value = $value[0]; 762 763 if ( $key != "_edit_lock" && $key != "_edit_last" 764 && isset( $value ) 765 && ! is_numeric( $value ) && strtolower( $value ) !== 'true' 766 && strtolower( $value ) !== 'false' 767 && is_serialized( $value ) === false ) { 768 if ( $value === strip_tags( $value ) ) { 769 $fields[ 'CUSTOMFIELD_' . $key ] = $value; 770 } else { 771 $files[ 'CUSTOMFIELD_' . $key ] = $this->createHTMLFile( $value ); 759 772 } 760 773 } 761 774 } 762 775 763 fwrite( $temp, json_encode( $data ) ); 764 765 $metaData = stream_get_meta_data( $temp ); 776 /** 777 * // Attachments and media 778 * 779 * 780 * $attachments = get_posts( array( 781 * 'post_parent' => $thePostId, 782 * 'post_type' => 'attachment', 783 * 'posts_per_page' => - 1, 784 * 'orderby' => 'menu_order', 785 * 'order' => 'ASC', 786 * ) ); 787 * 788 * if ( ! ! $attachments ) { 789 * foreach ( $attachments as $attachment ) { 790 * $id = $attachment->ID; 791 * $title = $attachment->post_title; 792 * $excerpt = $attachment->post_excerpt; 793 * 794 * $alt = get_post_meta( $id, '_wp_attachment_image_alt', true ); 795 * 796 * if(strlen($title) > 0) { 797 * if ($title === strip_tags($title)) { 798 * $fields['ATTACHMENT_' . $attachment->ID . '_TITLE'] = $title; 799 * } else { 800 * $files['ATTACHMENT_' . $attachment->ID . '_TITLE'] = $this->createHTMLFile($title); 801 * } 802 * } 803 * 804 * if(strlen($excerpt) > 0) { 805 * if ($excerpt === strip_tags($excerpt)) { 806 * $fields['ATTACHMENT_' . $attachment->ID . '_EXCERPT'] = $excerpt; 807 * } else { 808 * $files['ATTACHMENT_' . $attachment->ID . '_EXCERPT'] = $this->createHTMLFile($excerpt); 809 * } 810 * } 811 * 812 * if ( strlen($alt) > 1 ) { 813 * if($alt === strip_tags($alt)) { 814 * $fields[ 'ATTACHMENT_' . $attachment->ID . '_ALT' ] = $alt; 815 * } else { 816 * $files['ATTACHMENT_' . $attachment->ID . '_ALT'] = $this->createHTMLFile($alt); 817 * } 818 * } 819 * } 820 * } 821 */ 822 766 823 $callbackEndpoint = ! ! $motawordPlugin ? $motawordPlugin->getCallbackEndpoint() : 'mw-callback'; 767 $callback_url = get_home_url() . '?'.$callbackEndpoint.'=1';768 769 $p roject = $mwApiHelper->submitProject(array(824 $callback_url = get_home_url() . '?' . $callbackEndpoint . '=1'; 825 826 $params = array( 770 827 'source_language' => $sourceLang, 771 828 'target_languages[]' => $targetLang, 772 'documents' => array( 773 '@' . $metaData['uri'] . ';filename=' . $wpPostId . '.' . $defaultType 774 ), 829 'documents' => array(), 775 830 'callback_url' => $callback_url, 776 831 'custom[wp_post_id]' => $wpPostId 777 ) ); 832 ); 833 834 $documents = array(); 835 836 if ( count( $fields ) > 0 ) { 837 $fieldsFile = tmpfile(); 838 fwrite( $fieldsFile, json_encode( $fields ) ); 839 $fieldsMeta = stream_get_meta_data( $fieldsFile ); 840 $documents[] = '@' . $fieldsMeta['uri'] . ';filename=' . $wpPostId . '.' . $defaultType; 841 } 842 843 if ( count( $files ) ) { 844 foreach ( $files as $name => $file ) { 845 $fileMeta = stream_get_meta_data( $file ); 846 $documents[] = '@' . $fileMeta['uri'] . ';filename=' . $name . '.html'; 847 } 848 } 849 850 $params['documents'] = $documents; 851 852 $project = $mwApiHelper->submitProject( $params ); 778 853 779 854 if ( ! $project || ! isset( $project->id ) ) { 780 $this->issue_error( sprintf( 781 __( 'An error occurred while submitting your posts to MotaWord for a quote: %s', 'motaword' ), 782 '<br><br><pre>' . json_encode( $project, JSON_PRETTY_PRINT ) . '</pre>' ) 783 ); 855 $this->issue_error( sprintf( __( 'An error occurred while submitting your posts to MotaWord for a quote: %s', 856 'motaword' ), '<br><br><pre>' . json_encode( $project, JSON_PRETTY_PRINT ) . '</pre>' ) ); 784 857 } 785 858 … … 797 870 } 798 871 799 $title = sprintf( 800 _n( 801 'We can translate this WordPress post for just <strong>%1$s%2$s</strong>.', 802 'We can translate these WordPress posts for just <strong>%1$s%2$s</strong>.', 803 count( $projects ), 804 'motaword' 805 ), 806 MotaWord_i18n::getCurrency( $currency ), 807 $totalCost 808 ); 809 810 $subTitle = sprintf( 811 _n( 812 'OUR QUOTE IS BASED ON <strong>%1$d</strong> WORDS.', 813 'OUR QUOTE IS BASED ON <strong>%1$d</strong> WORDS FOR %2$d POSTS.', 814 count( $projects ), 815 'motaword' 816 ), 817 $totalWordCount, 818 count( $projects ) 819 ); 872 $title = sprintf( _n( 'We can translate this WordPress post for just <strong>%1$s%2$s</strong>.', 873 'We can translate these WordPress posts for just <strong>%1$s%2$s</strong>.', count( $projects ), 874 'motaword' ), MotaWord_i18n::getCurrency( $currency ), $totalCost ); 875 876 $subTitle = sprintf( _n( 'OUR QUOTE IS BASED ON <strong>%1$d</strong> WORDS.', 877 'OUR QUOTE IS BASED ON <strong>%1$d</strong> WORDS FOR %2$d POSTS.', count( $projects ), 'motaword' ), 878 $totalWordCount, count( $projects ) ); 820 879 821 880 echo ' … … 829 888 830 889 <p class="submit" style="text-align: center;"> 831 <input type="submit" name="submit" id="submit" class="button button-primary button-large" value="' . __( 'Start Project', 'motaword' ) . '"> 890 <input type="submit" name="submit" id="submit" class="button button-primary button-large" value="' . __( 'Start Project', 891 'motaword' ) . '"> 832 892 </p> 833 893 <p> 834 <em>' . __( 'Have questions? <a href="https://www.motaword.com/contact" target="_blank">We are one email away.</a>', 'motaword' ) . '</em> 894 <em>' . __( 'Have questions? <a href="https://www.motaword.com/contact" target="_blank">We are one email away.</a>', 895 'motaword' ) . '</em> 835 896 </p> 836 897 … … 838 899 839 900 exit(); 901 } 902 903 protected function createHTMLFile( $content ) { 904 $temp = tmpfile(); 905 fwrite( $temp, (string) $content ); 906 907 return $temp; 840 908 } 841 909 … … 900 968 901 969 if ( count( $uniqueLangs ) > 1 || count( $uniqueLangs ) < 1 ) { 902 $this->issue_error( __( 'Source languages of the posts you selected don\'t match. Please select the posts with the same language.', 'motaword' ) ); 970 $this->issue_error( __( 'Source languages of the posts you selected don\'t match. Please select the posts with the same language.', 971 'motaword' ) ); 903 972 } 904 973 … … 931 1000 </div>'; 932 1001 933 echo '<h4>' . sprintf( 934 _n( 935 'You have selected %d post.', 936 'You have selected %d posts.', 937 count( $wpPostIds ), 938 'motaword' 939 ), 940 count( $wpPostIds ) 941 ) . '</h4>'; 942 943 echo '<p>' . __( 'To get your quote, please select your translation languages and continue.', 'motaword' ) . '</p>'; 1002 echo '<h4>' . sprintf( _n( 'You have selected %d post.', 'You have selected %d posts.', count( $wpPostIds ), 1003 'motaword' ), count( $wpPostIds ) ) . '</h4>'; 1004 1005 echo '<p>' . __( 'To get your quote, please select your translation languages and continue.', 1006 'motaword' ) . '</p>'; 944 1007 945 1008 echo '<form method="get" action="' . admin_url( 'admin-ajax.php' ) . '" id="mw_quote_form">'; … … 961 1024 $name = $language->name; 962 1025 if ( $code === $mainSourceLanguage ) { 963 $sourceBox .= '<option value="' . $code . '" selected="selected">' . __( $name, 'motaword' ) . '</option>'; 1026 $sourceBox .= '<option value="' . $code . '" selected="selected">' . __( $name, 1027 'motaword' ) . '</option>'; 964 1028 } else { 965 1029 $sourceBox .= '<option value="' . $code . '">' . __( $name, 'motaword' ) . '</option>'; … … 978 1042 979 1043 if ( $targetSelected === false && $code !== $mainSourceLanguage ) { 980 $targetBox .= '<option value="' . $code . '" selected="selected">' . __( $name, 'motaword' ) . '</option>'; 1044 $targetBox .= '<option value="' . $code . '" selected="selected">' . __( $name, 1045 'motaword' ) . '</option>'; 981 1046 $targetSelected = true; 982 1047 } else { … … 993 1058 echo '<div> 994 1059 <p class="submit" style="text-align: center;"> 995 <input type="submit" name="submit" id="submit" class="button button-primary button-large" value="' . __( 'Continue to get a quote', 'motaword' ) . '"> 1060 <input type="submit" name="submit" id="submit" class="button button-primary button-large" value="' . __( 'Continue to get a quote', 1061 'motaword' ) . '"> 996 1062 </p> 997 1063 <p> 998 <em>' . __( 'Have questions? <a href="https://www.motaword.com/contact" target="_blank">We are one email away.</a>', 'motaword' ) . '</em> 1064 <em>' . __( 'Have questions? <a href="https://www.motaword.com/contact" target="_blank">We are one email away.</a>', 1065 'motaword' ) . '</em> 999 1066 </p> 1000 1067 </div></form>'; … … 1105 1172 1106 1173 if ( (int) $success > 0 ) { 1107 $title = _n( 1108 'Your post has been submitted for translation!', 1109 'Your posts have been submitted for translation!', 1110 $success, 1111 'motaword' 1112 ); 1113 1114 $subTitle = _n( 1115 'You can track its progress on post editing screen or <a href="https://www.motaword.com/projects" target="_blank">your MotaWord dashboard</a>.', 1174 $title = _n( 'Your post has been submitted for translation!', 1175 'Your posts have been submitted for translation!', $success, 'motaword' ); 1176 1177 $subTitle = _n( 'You can track its progress on post editing screen or <a href="https://www.motaword.com/projects" target="_blank">your MotaWord dashboard</a>.', 1116 1178 'You can track their progress on post editing screen or <a href="https://www.motaword.com/projects" target="_blank">your MotaWord dashboard</a>.', 1117 $success, 1118 'motaword' 1119 ); 1179 $success, 'motaword' ); 1120 1180 1121 1181 echo '<h2 style="font-weight: normal;">' . $title . '</h2> … … 1125 1185 if ( $rejected || ! $success ) { 1126 1186 echo '<br/>'; 1127 $this->issue_error( __( 'Your job(s) has been rejected.' . ( $errorResponse ? '<br/><br/><pre style="text-align: left;">' . json_encode( $errorResponse, JSON_PRETTY_PRINT ) . '</pre>' : '' ), 'motaword' ) ); 1128 } 1129 1130 echo '<p><em>' . __( 'Have questions? <a href="https://www.motaword.com/contact" target="_blank">We are one email away.</a>', 'motaword' ) . '</em></p></div>'; 1187 $this->issue_error( __( 'Your job(s) has been rejected.' . ( $errorResponse 1188 ? '<br/><br/><pre style="text-align: left;">' . json_encode( $errorResponse, 1189 JSON_PRETTY_PRINT ) . '</pre>' : '' ), 'motaword' ) ); 1190 } 1191 1192 echo '<p><em>' . __( 'Have questions? <a href="https://www.motaword.com/contact" target="_blank">We are one email away.</a>', 1193 'motaword' ) . '</em></p></div>'; 1131 1194 1132 1195 exit(); … … 1145 1208 */ 1146 1209 public function register_my_custom_menu_page() { 1147 add_options_page( __( 'MotaWord', 'motaword' ), __( 'MotaWord', 'motaword' ), 'manage_options', 'motaword', array( 1148 $this, 1149 'settings' 1150 ) ); 1210 add_options_page( __( 'MotaWord', 'motaword' ), __( 'MotaWord', 'motaword' ), 'manage_options', 'motaword', 1211 array( 1212 $this, 1213 'settings' 1214 ) ); 1151 1215 } 1152 1216 1153 1217 public function network_settings() { 1154 $this->settings( true);1218 $this->settings( true ); 1155 1219 } 1156 1220 … … 1160 1224 * @param bool|false $network 1161 1225 */ 1162 public function settings( $network = false) {1226 public function settings( $network = false ) { 1163 1227 global $motawordPlugin; 1164 1228 1165 $network = (bool) $network;1229 $network = (bool) $network; 1166 1230 1167 1231 $this->exitOnError = true; 1168 1232 1169 1233 if ( $_POST ) { 1170 $this->save_settings( $network);1234 $this->save_settings( $network ); 1171 1235 } 1172 1236 1173 1237 $options = array( 1174 'id' => $motawordPlugin->getOption( static::$options['client_id'], $network ),1238 'id' => $motawordPlugin->getOption( static::$options['client_id'], $network ), 1175 1239 'secret' => $motawordPlugin->getOption( static::$options['client_secret'], $network ), 1176 1240 'sandbox' => (bool) $motawordPlugin->getOption( static::$options['sandbox'], $network ), … … 1184 1248 <?php if ( isset( $_GET['activated'] ) ): ?> 1185 1249 <div class="updated"><p> 1186 <?php _e('Let\'s make sure you put your API client ID and secret here. If you have any 1187 questions, just head to <a href="https://www.motaword.com/developer" target="_blank">documentation</a>.', 'motaword'); ?> 1188 1189 <?php if($network): ?> 1190 <?php _e('Remember, you can also specify different API clients for your sites by visiting MotaWord settings page in each site\'s admin section.', 'motaword'); ?> 1250 <?php _e( 'Let\'s make sure you put your API client ID and secret here. If you have any 1251 questions, just head to <a href="https://www.motaword.com/developer" target="_blank">documentation</a>.', 1252 'motaword' ); ?> 1253 1254 <?php if ( $network ): ?> 1255 <?php _e( 'Remember, you can also specify different API clients for your sites by visiting MotaWord settings page in each site\'s admin section.', 1256 'motaword' ); ?> 1191 1257 <?php endif; ?> 1192 1258 </p></div> … … 1200 1266 <th scope="row"><?php _e( 'API Client ID:', 'motaword' ); ?></th> 1201 1267 <td><input type="text" name="<?php echo MotaWord::getOptionsKey() ?>[api_client_id]" 1202 1268 value="<?php echo $options['id']; ?>"/></td> 1203 1269 </tr> 1204 1270 <tr valign="top"> 1205 1271 <th scope="row"><?php _e( 'API Client Secret:', 'motaword' ); ?></th> 1206 1272 <td><input type="text" name="<?php echo MotaWord::getOptionsKey() ?>[api_client_secret]" 1207 1273 value="<?php echo $options['secret']; ?>"/></td> 1208 1274 </tr> 1209 1275 <tr valign="top"> 1210 1276 <th scope="row"><?php _e( 'Sandbox mode:', 'motaword' ); ?></th> 1211 1277 <td><input type="checkbox" value="1" 1212 name="<?php echo MotaWord::getOptionsKey() ?>[is_sandbox]" <?php echo isset( $options['sandbox'] ) && ! ! $options['sandbox'] ? 'checked="checked"' : ''; ?> /> 1278 name="<?php echo MotaWord::getOptionsKey() ?>[is_sandbox]" <?php echo isset( $options['sandbox'] ) && ! ! $options['sandbox'] 1279 ? 'checked="checked"' : ''; ?> /> 1213 1280 </td> 1214 1281 </tr> … … 1227 1294 * @param bool|false $network 1228 1295 */ 1229 public function save_settings( $network = false) {1296 public function save_settings( $network = false ) { 1230 1297 global $motawordPlugin; 1231 1298 … … 1258 1325 } 1259 1326 1260 if ( (int) $motawordPlugin->getOption( static::$options['sandbox'], $network ) !== (int) $newSandboxValue ) { 1327 if ( (int) $motawordPlugin->getOption( static::$options['sandbox'], 1328 $network ) !== (int) $newSandboxValue 1329 ) { 1261 1330 // Clear the API caches as we are changing the environment here. 1262 1331 $api = $this->getAPI(); … … 1351 1420 $icon = 'icon_ongoing'; 1352 1421 1353 $message = sprintf( 1354 __( "We are still working on the translation of this post.\n\nTranslation: %1\$d%%\nProofreading: %2\$d%%", 'motaword' ), 1355 $translationPercentage, 1356 $proofreadingPercentage 1357 ); 1422 $message = sprintf( __( "We are still working on the translation of this post.\n\nTranslation: %1\$d%%\nProofreading: %2\$d%%", 1423 'motaword' ), $translationPercentage, $proofreadingPercentage ); 1358 1424 } 1359 1425 … … 1371 1437 $type = $current_screen->post_type; 1372 1438 1373 if ( is_plugin_active( 'polylang/polylang.php' ) 1374 && ( function_exists( 'pll_is_translated_post_type' ) && pll_is_translated_post_type( $type ) ) 1375 ) { 1439 if ( is_plugin_active( 'polylang/polylang.php' ) && ( function_exists( 'pll_is_translated_post_type' ) && pll_is_translated_post_type( $type ) ) ) { 1376 1440 return $columns; 1377 1441 } … … 1383 1447 } 1384 1448 1385 $columns['motaword'] = '<img src="' . plugin_dir_url( __FILE__ ) . '/css/icon.png" style="width: 20px; height: 20px;" title="' . __( 'MotaWord Summary', 'motaword' ) . '" alt="' . __( 'MotaWord Summary', 'motaword' ) . '"/>'; 1449 $columns['motaword'] = '<img src="' . plugin_dir_url( __FILE__ ) . '/css/icon.png" style="width: 20px; height: 20px;" title="' . __( 'MotaWord Summary', 1450 'motaword' ) . '" alt="' . __( 'MotaWord Summary', 'motaword' ) . '"/>'; 1386 1451 1387 1452 return isset( $end ) ? array_merge( $columns, $end ) : $columns; -
motaword/trunk/admin/js/motaword-admin.js
r1265215 r1276630 192 192 }); 193 193 194 // To prevent successive quote submissions (which triggers errors because of multiple 195 // payment trial and well, why would you want to submit twice?) 196 var submittedQuote = false; 197 194 198 jQuery(document).ready(function () { 195 199 var body = jQuery('body'); … … 264 268 e.preventDefault(); 265 269 270 if(submittedQuote === true) { 271 return false; 272 } 273 274 submittedQuote = true; 275 jQuery('#submit').val('Loading...').attr('disabled', true); 276 266 277 jQuery.post(ajaxurl, jQuery('#mw_quote_form').serialize(), function (result) { 278 submittedQuote = false; 279 267 280 jQuery('#TB_ajaxContent').html(result); 268 281 jQuery('#motaword_box').find('.inside').html('<div class="mw_warning">Refresh the page to get latest translation updates.</div>'); -
motaword/trunk/includes/class-motaword-api.php
r1265236 r1276630 57 57 * @param string $clientId 58 58 * @param string $clientSecret 59 * @param bool $useSandbox60 * @param bool $isCached59 * @param bool $useSandbox 60 * @param bool $isCached 61 61 * @param string $cachePrefix 62 * @param int $cacheExpiration 63 */ 64 function __construct( $clientId, $clientSecret, $useSandbox = false, $isCached = true, $cachePrefix = 'motaword_', $cacheExpiration = 300 ) { 62 * @param int $cacheExpiration 63 */ 64 function __construct( 65 $clientId, 66 $clientSecret, 67 $useSandbox = false, 68 $isCached = true, 69 $cachePrefix = 'motaword_', 70 $cacheExpiration = 300 71 ) { 65 72 $this->useSandbox = (bool) $useSandbox; 66 73 $this->clientId = $clientId; … … 70 77 static::$cacheExpiration = $cacheExpiration; 71 78 72 if ((bool)$useSandbox) {73 static::$cachePrefix = static::$cachePrefix .'sandbox_';74 } 75 } 76 77 public static function setEndpoint( $production, $sandbox) {79 if ( (bool) $useSandbox ) { 80 static::$cachePrefix = static::$cachePrefix . 'sandbox_'; 81 } 82 } 83 84 public static function setEndpoint( $production, $sandbox ) { 78 85 self::$PRODUCTION_URL = $production; 79 self::$SANDBOX_URL = $sandbox;86 self::$SANDBOX_URL = $sandbox; 80 87 } 81 88 … … 91 98 if ( ( $result = get_site_transient( static::$cachePrefix . 'languages' ) ) === false ) { 92 99 $result = $this->get( 'languages' ); 93 set_site_transient( static::$cachePrefix . 'languages', $result ); 100 101 if ( ! ! $result && ! isset( $result->error ) ) { 102 set_site_transient( static::$cachePrefix . 'languages', $result ); 103 } 94 104 } 95 105 } else { … … 119 129 120 130 if ( ! ! $result && ! isset( $result->error ) ) { 121 set_site_transient( static::$cachePrefix . 'project_' . $projectId, $result, static::$cacheExpiration ); 131 set_site_transient( static::$cachePrefix . 'project_' . $projectId, $result, 132 static::$cacheExpiration ); 122 133 } 123 134 } … … 148 159 149 160 if ( ! ! $result && ! isset( $result->error ) ) { 150 set_site_transient( static::$cachePrefix . 'progress_' . $projectId, $result, static::$cacheExpiration ); 161 set_site_transient( static::$cachePrefix . 'progress_' . $projectId, $result, 162 static::$cacheExpiration ); 151 163 } 152 164 } … … 181 193 */ 182 194 public function downloadProject( $projectId ) { 183 $response = $this->post( 184 'projects/' . $projectId . '/package', 185 array( 'async' => 0 ) 186 ); 195 $response = $this->post( 'projects/' . $projectId . '/package', array( 'async' => 0 ) ); 187 196 188 197 return $response; … … 193 202 * 194 203 * @param integer $projectId 195 * @param array $data204 * @param array $data 196 205 * 197 206 * @return object … … 205 214 * to prevent unnecessary calls. 206 215 * 207 * @param bool $forceNew When true, we'll retrieve a new access token even though the previous one was not216 * @param bool $forceNew When true, we'll retrieve a new access token even though the previous one was not 208 217 * expired yet. 209 218 * … … 219 228 'User-Agent' => $this->getUserAgent(), 220 229 'Accept' => 'application/json', 221 'Authorization' => 'Basic ' . base64_encode( 222 $this->clientId . ':' . $this->clientSecret 223 ), 230 'Authorization' => 'Basic ' . base64_encode( $this->clientId . ':' . $this->clientSecret ), 224 231 'Content-Type' => 'application/x-www-form-urlencoded' 225 232 ), … … 236 243 $response = wp_remote_post( $url, $options ); 237 244 238 if (!$response || $response instanceof WP_Error) {245 if ( ! $response || $response instanceof WP_Error ) { 239 246 return null; 240 247 } … … 245 252 if ( isset( $response['access_token'] ) ) { 246 253 $accessToken = $response['access_token']; 247 set_site_transient( static::$cachePrefix . 'access_token', $accessToken, ( $response['expires_in'] - 300 ) ); 254 set_site_transient( static::$cachePrefix . 'access_token', $accessToken, 255 ( $response['expires_in'] - 300 ) ); 248 256 } 249 257 } … … 324 332 * Regular form body. 325 333 * 326 * @param string $name Form input name334 * @param string $name Form input name 327 335 * @param string $value Form input value 328 336 * … … 336 344 * File upload form body. 337 345 * 338 * @param string $key Form input name346 * @param string $key Form input name 339 347 * @param string $path File path 340 348 * … … 377 385 if ( is_array( $datum ) ) { 378 386 foreach ( $datum as $i => $datuman ) { 379 $result[ $key . '[' . ''. ']' ] = $datuman;387 $result[ $key . '[' . $i . ']' ] = $datuman; 380 388 } 381 389 } else { … … 406 414 * 407 415 * @param string $path Relative API resource path 408 * @param array $data Query parameters416 * @param array $data Query parameters 409 417 * 410 418 * @return object … … 417 425 * HTTP POST 418 426 * 419 * @param string $pathRelative API resource path420 * @param array $dataPost form data427 * @param string $path Relative API resource path 428 * @param array $data Post form data 421 429 * @param boolean $upload Is this a file upload? 422 430 * … … 431 439 * 432 440 * @param string $path Relative API resource path 433 * @param array $data Put body parameters441 * @param array $data Put body parameters 434 442 * 435 443 * @return object … … 442 450 * HTTP request base 443 451 * 444 * @param string $pathRelative API resource path445 * @param string $method HTTP method: GET, POST, PUT, DELETE446 * @param array $dataRequest parameters452 * @param string $path Relative API resource path 453 * @param string $method HTTP method: GET, POST, PUT, DELETE 454 * @param array $data Request parameters 447 455 * @param boolean $upload Is this a file upload? 448 456 * … … 490 498 } 491 499 492 if (!$response || $response instanceof WP_Error) {500 if ( ! $response || $response instanceof WP_Error ) { 493 501 return null; 494 502 } 495 503 496 $response = json_decode( trim( $response['body'] ) ); 504 // If this is not a document/style guide/glossary/translation download request, 505 // it must be in JSON. 506 if ( strpos( $path, 'download' ) > - 1 507 || ( strpos( $path, 'package' ) > - 1 508 && isset( $data['async'] ) && (bool) $data['async'] === false ) 509 ) { 510 $response = $response['body']; 511 } else { 512 $response = json_decode( trim( $response['body'] ) ); 513 } 497 514 498 515 return $response; -
motaword/trunk/includes/class-motaword-db.php
r1265236 r1276630 69 69 return array( (object) $result ); 70 70 } else { 71 return static::getDB()->get_results( "SELECT * FROM " . $this->table_name . " WHERE post_wp_id = " . $wpPostId ); 71 return static::getDB() 72 ->get_results( "SELECT * FROM " . $this->table_name . " WHERE post_wp_id = " . $wpPostId ); 72 73 } 73 74 } … … 81 82 'meta_value' => $projectId, 82 83 'post_status' => $status, 84 'post_type' => 'any', 83 85 'fields' => 'ids' 84 86 ); … … 94 96 return null; 95 97 } else { 96 return static::getDB()->get_var( "SELECT post_wp_id FROM " . $this->table_name . " WHERE mw_project_id = " . $projectId ); 98 return static::getDB() 99 ->get_var( "SELECT post_wp_id FROM " . $this->table_name . " WHERE mw_project_id = " . $projectId ); 97 100 } 98 101 } … … 101 104 * add new lanched project in to local db 102 105 * 103 * @param integer $postId WP post ID.106 * @param integer $postId WP post ID. 104 107 * @param integer $mwProjectId MotaWord project ID. 105 * @param string $statusstarted, completed.108 * @param string $status started, completed. 106 109 * 107 110 * @return mixed … … 114 117 if ( static::$use_meta ) { 115 118 update_post_meta( $postId, static::$meta_prefix . 'project_id', $mwProjectId ); 119 116 120 return $this->updateProject( $postId, $status, 0, 0 ); 117 121 } else { -
motaword/trunk/motaword.php
r1271940 r1276630 16 16 * Plugin URI: https://www.motaword.com/developer 17 17 * Description: MotaWord plugin allows you to seamlessly submit your posts for translation to MotaWord. 18 * Version: 1. 0.018 * Version: 1.1.0 19 19 * Author: Oytun Tez <[email protected]> 20 20 * Author URI: https://www.motaword.com/developer -
motaword/trunk/public/class-motaword-public.php
r1265236 r1276630 47 47 * 48 48 * @param string $motaword The name of the plugin. 49 * @param string $version The version of this plugin.49 * @param string $version The version of this plugin. 50 50 */ 51 51 public function __construct( $motaword, $version ) { … … 69 69 include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); 70 70 71 if ( !function_exists('is_plugin_active') 72 || ! is_plugin_active( !!$motawordPlugin ? $motawordPlugin->getPluginFile() : 'motaword/motaword.php' ) ) { 71 if ( ! function_exists( 'is_plugin_active' ) || ! is_plugin_active( ! ! $motawordPlugin 72 ? $motawordPlugin->getPluginFile() : 'motaword/motaword.php' ) 73 ) { 73 74 return false; 74 75 } … … 77 78 78 79 if ( isset( $_GET[ $callbackEndpoint ] ) ) { 79 if ( isset( $_POST['type'] ) 80 && isset( $_POST['project'] ) 81 && isset( $_POST['action'] ) 82 && $this->process_callback( sanitize_text_field($_POST['action']), $_POST['project'] ) 80 if ( isset( $_POST['type'] ) && isset( $_POST['project'] ) && isset( $_POST['action'] ) && $this->process_callback( sanitize_text_field( $_POST['action'] ), 81 $_POST['project'] ) 83 82 ) { 84 83 echo json_encode( array( 'status' => 'success' ) ); … … 94 93 } 95 94 96 $mwProjectId = intval( sanitize_text_field($project['id']));97 98 if (!$mwProjectId) {95 $mwProjectId = intval( sanitize_text_field( $project['id'] ) ); 96 97 if ( ! $mwProjectId ) { 99 98 return false; 100 99 } 101 100 102 $mwApiHelper = new MotaWord_API( 103 get_option( MotaWord_Admin::$options['client_id'] ), 101 $mwApiHelper = new MotaWord_API( get_option( MotaWord_Admin::$options['client_id'] ), 104 102 get_option( MotaWord_Admin::$options['client_secret'] ), 105 (bool) get_option( MotaWord_Admin::$options['sandbox'] ) 106 ); 103 (bool) get_option( MotaWord_Admin::$options['sandbox'] ) ); 107 104 108 105 //$wpPostId = $project['custom']['wp_post_id']; … … 110 107 $wpPostId = $DBHelper->getPostIDByProjectID( $mwProjectId, 'any' ); 111 108 112 $translatedProject = $mwApiHelper->downloadProject( $mwProjectId ); 113 114 // Update Post 115 $updated_post = array( 116 'ID' => $wpPostId, 117 'post_title' => $translatedProject->TITLE, 118 'post_content' => $translatedProject->CONTENT, 119 'post_excerpt' => $translatedProject->EXCERPT 109 // Post data 110 $updateData = array( 111 'ID' => $wpPostId 112 // Other data to be updated will be added below. 120 113 ); 121 122 $translatedArray = (array) $translatedProject; 123 124 foreach ( $translatedArray as $key => $val ) { 125 // Update Meta Value 126 if ( strpos( $key, 'CUSTOMFIELD_' ) ) { 127 $metakeyArr = explode( "CUSTOMFIELD_", $key ); 128 update_post_meta( $wpPostId, $metakeyArr[1], $val ); 129 } 114 // Custom fields data 115 $customFieldData = array(); 116 117 // @var Array Incoming data from MotaWord to be updated on the WP post. 118 $incomingData = array(); 119 120 $zipFileBody = $mwApiHelper->downloadProject( $mwProjectId ); 121 122 $zipFile = tmpfile(); 123 fwrite( $zipFile, $zipFileBody ); 124 $zipFilePath = stream_get_meta_data( $zipFile ); 125 $zipFilePath = $zipFilePath['uri']; 126 127 $baseFolder = wp_upload_dir(); 128 $baseFolder = $baseFolder['path']; 129 $baseFolder = trailingslashit( $baseFolder ) . '' . rand(); 130 131 if ( ! mkdir( $baseFolder ) ) { 132 throw new \Exception( 'Could not create a temporary folder for translated files. Make sure you have required permissions.' ); 133 } 134 135 $zip = new \ZipArchive; 136 137 if ( $zip->open( $zipFilePath ) === true ) { 138 if ( ! $zip->extractTo( $baseFolder ) ) { 139 throw new \Exception( 'Could not extract the translation ZIP file.' ); 140 } 141 142 $zip->close(); 143 } else { 144 throw new \Exception( 'Could not open the translation ZIP file.' ); 145 } 146 147 // MW is sending files in a subfolder, per language. 148 $languageFolders = glob( $baseFolder . '/*' ); 149 150 // Folder is the actual inner folder which contains .json and .html files. It can be a language folder. 151 $folder = $baseFolder; 152 153 if ( is_array( $languageFolders ) && count( $languageFolders ) > 0 ) { 154 $folder = $languageFolders[0]; 155 } 156 157 // If a 123.json file exists, which keeps non-html key-value content. 158 // We are merging all incoming data, from json or html, in one array (or two, with custom fields). 159 // We will apply the update later altogether. 160 $jsonFiles = glob( $folder . "/*.json" ); 161 162 if(is_Array($jsonFiles) && isset($jsonFiles[0])) { 163 $jsonFile = $jsonFiles[0]; 164 165 $fields = file_get_contents( $jsonFile ); 166 $fields = json_decode( $fields, true ); 167 168 if ( ! ! $fields && is_array( $fields ) ) { 169 $incomingData = array_merge( $incomingData, $fields ); 170 } 171 172 unset( $fields ); 173 } 174 175 // Get remaining html files, if any. 176 // We are merging all incoming data, from json or html, in one array (or two, with custom fields). 177 // We will apply the update later altogether. 178 foreach ( glob( $folder . "/*.html" ) as $file ) { 179 $fileName = basename( $file ); 180 $key = str_replace( '.html', '', $fileName ); 181 182 if ( ! $key ) { 183 continue; 184 } 185 186 $value = file_get_contents( $file ); 187 188 if ( strlen( $value ) < 1 ) { 189 continue; 190 } 191 192 $incomingData[ $key ] = $value; 193 194 // $value can be large. 195 unset( $value ); 196 } 197 198 // We don't need downloaded files any more. All data in memory at the moment. 199 $this->recursive_rmdir( $baseFolder ); 200 // tmpfile Resource will be deleted here. 201 fclose( $zipFile ); 202 203 foreach ( $incomingData as $key => $value ) { 204 if ( strlen( $value ) < 1 ) { 205 continue; 206 } 207 208 switch ( $key ) { 209 case 'TITLE': 210 $updateData['post_title'] = $value; 211 break; 212 case 'CONTENT': 213 $updateData['post_content'] = $value; 214 break; 215 case 'EXCERPT': 216 $updateData['post_excerpt'] = $value; 217 break; 218 default: 219 if ( strpos( $key, 'CUSTOMFIELD_' ) > - 1 ) { 220 $key = str_replace( 'CUSTOMFIELD_', '', $key ); 221 222 if ( strlen( $key ) > 0 ) { 223 $customFieldData[ $key ] = $value; 224 } 225 } 226 227 break; 228 } 229 } 230 231 foreach ( $customFieldData as $key => $value ) { 232 update_post_meta( $wpPostId, $key, $value ); 130 233 131 234 // Update Media Posts 132 235 /* 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 } 149 150 $result = wp_update_post( $update d_post, true );236 if(strpos($key,'ATTACHMENT_')) 237 { 238 $mediakeyArr = explode("_",$key); 239 240 // Update Post 241 $updated_post = array( 242 'ID' => $$mediakeyArr[1], 243 'post_title' => $translatedProject->title, 244 'post_content' => $translatedProject->content, 245 'post_excerpt' => $translatedProject->excerpt 246 ); 247 248 update_post_meta($wpPostId, $metakeyArr[1], $val); 249 } 250 */ 251 } 252 253 $result = wp_update_post( $updateData, true ); 151 254 152 255 $DBHelper->updateProject( $wpPostId, 'completed', 100, 100 ); … … 159 262 } 160 263 264 function recursive_rmdir( $dir ) { 265 if ( is_dir( $dir ) ) { 266 $objects = array_diff( scandir( $dir ), array( '..', '.' ) ); 267 foreach ( $objects as $object ) { 268 $objectPath = $dir . "/" . $object; 269 if ( is_dir( $objectPath ) ) { 270 $this->recursive_rmdir( $objectPath ); 271 } else { 272 unlink( $objectPath ); 273 } 274 } 275 rmdir( $dir ); 276 } 277 } 278 161 279 } -
motaword/trunk/uninstall.php
r1265236 r1276630 11 11 } 12 12 13 if ( ! current_user_can( 'activate_plugins' ) ) 13 if ( ! current_user_can( 'activate_plugins' ) ) { 14 14 exit; 15 } 15 16 16 17 check_admin_referer( 'bulk-plugins' ); … … 18 19 // Important: Check if the file is the one 19 20 // that was registered during the uninstall hook. 20 if ( strpos( WP_UNINSTALL_PLUGIN, 'motaword.php') < 0 )21 if ( strpos( WP_UNINSTALL_PLUGIN, 'motaword.php' ) === false ) { 21 22 exit; 23 } 22 24 23 25 require plugin_dir_path( __FILE__ ) . 'includes/class-motaword.php'; 24 26 25 $plugin = new MotaWord( plugin_basename(__FILE__));27 $plugin = new MotaWord( plugin_basename( __FILE__ ) ); 26 28 $plugin->run(); 27 29 28 30 MotaWord_API::clear_cache(); 29 delete_option( MotaWord_Admin::$options['client_id']);30 delete_option( MotaWord_Admin::$options['client_secret']);31 delete_option( MotaWord_Admin::$options['sandbox']);31 delete_option( MotaWord_Admin::$options['client_id'] ); 32 delete_option( MotaWord_Admin::$options['client_secret'] ); 33 delete_option( MotaWord_Admin::$options['sandbox'] );
Note: See TracChangeset
for help on using the changeset viewer.