WordPress.org

Plugin Directory

Changeset 642313


Ignore:
Timestamp:
12/20/12 13:28:38 (16 months ago)
Author:
wpmuguru
Message:

tag & release 4.0.10

Location:
scribe
Files:
133 added
36 edited

Legend:

Unmodified
Added
Removed
  • scribe/trunk/lib/class-admin.php

    r614019 r642313  
    9494        $this->page_ops = wp_parse_args( $this->page_ops, array( 
    9595            'screen_icon'       => 'options-general', 
    96             'save_button_text'  => __( 'Save Settings', 'premise' ), 
    97             'reset_button_text' => __( 'Reset Settings', 'premise' ), 
    98             'saved_notice_text' => __( 'Settings saved.', 'premise' ), 
    99             'reset_notice_text' => __( 'Settings reset.', 'premise' ) 
     96            'save_button_text'  => __( 'Save Settings', 'scribeseo' ), 
     97            'reset_button_text' => __( 'Reset Settings', 'scribeseo' ), 
     98            'saved_notice_text' => __( 'Settings saved.', 'scribeseo' ), 
     99            'reset_notice_text' => __( 'Settings reset.', 'scribeseo' ) 
    100100        ) ); 
    101101 
     
    106106        /** Check to make sure there we are only creating one menu per subclass */ 
    107107        if ( isset( $this->menu_ops['submenu'] ) && ( isset( $this->menu_ops['main_menu'] ) || isset( $this->menu_ops['first_submenu'] ) ) ) 
    108             wp_die( sprintf( __( 'You cannot use %s to create two menus in the same subclass. Please use separate subclasses for each menu.', 'premise' ), 'Scribe_Admin' ) ); 
     108            wp_die( sprintf( esc_html__( 'You cannot use %s to create two menus in the same subclass. Please use separate subclasses for each menu.', 'scribeseo' ), 'Scribe_Admin' ) ); 
    109109 
    110110        /** Create the menu(s). Conditional logic happens within the separate methods */ 
     
    256256 
    257257            foreach( $errors as $error ) 
    258                 echo '<div id="message" class="updated"><p><strong>' . $error['message'] . '</strong></p></div>'; 
     258                echo '<div id="message" class="updated"><p><strong>' . esc_html( $error['message'] ) . '</strong></p></div>'; 
    259259 
    260260            return; 
     
    262262 
    263263        if ( isset( $_REQUEST['reset'] ) && 'true' == $_REQUEST['reset'] ) 
    264             echo '<div id="message" class="updated"><p><strong>' . $this->page_ops['reset_notice_text'] . '</strong></p></div>'; 
     264            echo '<div id="message" class="updated"><p><strong>' . esc_html( $this->page_ops['reset_notice_text'] ) . '</strong></p></div>'; 
    265265        elseif ( isset( $_REQUEST['settings-updated'] ) && $_REQUEST['settings-updated'] == 'true' ) 
    266             echo '<div id="message" class="updated"><p><strong>' . $this->page_ops['saved_notice_text'] . '</strong></p></div>'; 
     266            echo '<div id="message" class="updated"><p><strong>' . esc_html( $this->page_ops['saved_notice_text'] ) . '</strong></p></div>'; 
    267267    } 
    268268 
     
    387387                <?php 
    388388                echo esc_html( get_admin_page_title() ); 
    389                 submit_button( $this->page_ops['save_button_text'], 'button-primary accesspress-h2-button', 'submit', false ); 
    390                 submit_button( $this->page_ops['reset_button_text'], 'button-secondary accesspress-h2-button', $this->get_field_name( 'reset' ), false, array( 'onclick' => 'return accesspress_confirm(\'' . esc_js( __( 'Are you sure you want to reset?', 'premise' ) ) . '\');' ) ); 
     389                submit_button( esc_attr( $this->page_ops['save_button_text'] ), 'button-primary accesspress-h2-button', 'submit', false ); 
     390                submit_button( esc_attr( $this->page_ops['reset_button_text'] ), 'button-secondary accesspress-h2-button', $this->get_field_name( 'reset' ), false, array( 'onclick' => 'return accesspress_confirm(\'' . esc_js( __( 'Are you sure you want to reset?', 'scribeseo' ) ) . '\');' ) ); 
    391391                ?> 
    392392            </h2> 
     
    396396            <div class="bottom-buttons"> 
    397397                <?php 
    398                 submit_button( $this->page_ops['save_button_text'], 'primary', 'submit', false ); 
    399                 submit_button( $this->page_ops['reset_button_text'], 'secondary', $this->get_field_name( 'reset' ), false, array( 'onclick' => 'return accesspress_confirm(\'' . esc_js( __( 'Are you sure you want to reset?', 'premise' ) ) . '\');' ) ); 
     398                submit_button( esc_attr( $this->page_ops['save_button_text'] ), 'primary', 'submit', false ); 
     399                submit_button( esc_attr( $this->page_ops['reset_button_text'] ), 'secondary', $this->get_field_name( 'reset' ), false, array( 'onclick' => 'return accesspress_confirm(\'' . esc_js( __( 'Are you sure you want to reset?', 'scribeseo' ) ) . '\');' ) ); 
    400400                ?> 
    401401            </div> 
     
    445445     * @since 0.1.0 
    446446     */ 
    447     public function scripts() { 
     447    public function scripts( $hook = '' ) { 
     448 
     449        if ( $hook != $this->pagehook ) 
     450            return; 
    448451 
    449452        wp_enqueue_script( 'common' ); 
     
    503506                <?php 
    504507                echo esc_html( get_admin_page_title() ); 
    505                 submit_button( $this->page_ops['save_button_text'], 'button-primary accesspress-h2-button', 'submit', false ); 
    506                 submit_button( $this->page_ops['reset_button_text'], 'button-highlighted accesspress-h2-button', $this->get_field_name( 'reset' ), false, array( 'onclick' => 'return accesspress_confirm(\'' . esc_js( __( 'Are you sure you want to reset?', 'premise' ) ) . '\');' ) ); 
     508                submit_button( esc_attr( $this->page_ops['save_button_text'] ), 'button-primary accesspress-h2-button', 'submit', false ); 
     509                submit_button( esc_attr( $this->page_ops['reset_button_text'] ), 'button-highlighted accesspress-h2-button', $this->get_field_name( 'reset' ), false, array( 'onclick' => 'return accesspress_confirm(\'' . esc_js( __( 'Are you sure you want to reset?', 'scribeseo' ) ) . '\');' ) ); 
    507510                ?> 
    508511            </h2> 
     
    520523            <div class="bottom-buttons"> 
    521524                <?php 
    522                 submit_button( $this->page_ops['save_button_text'], 'primary', 'submit', false ); 
    523                 submit_button( $this->page_ops['reset_button_text'], 'secondary', $this->get_field_name( 'reset' ), false, array( 'onclick' => 'return accesspress_confirm(\'' . esc_js( __( 'Are you sure you want to reset?', 'premise' ) ) . '\');' ) ); 
     525                submit_button( esc_attr( $this->page_ops['save_button_text'] ), 'primary', 'submit', false ); 
     526                submit_button( esc_attr( $this->page_ops['reset_button_text'] ), 'secondary', $this->get_field_name( 'reset' ), false, array( 'onclick' => 'return accesspress_confirm(\'' . esc_js( __( 'Are you sure you want to reset?', 'scribeseo' ) ) . '\');' ) ); 
    524527                ?> 
    525528            </div> 
     
    547550    public function settings_init() { 
    548551 
    549         // enqueue CSS 
    550         add_action( "admin_print_styles-{$this->pagehook}", array( $this, 'enqueue_admin_css' ) ); 
     552        // enqueue CSS & scripts 
     553        add_action( "admin_enqueue_scripts", array( $this, 'enqueue_admin_css' ) ); 
     554        add_action( "admin_enqueue_scripts", array( $this, 'scripts' ) ); 
    551555        // enqueue scrupts 
    552         add_action( 'load-'.$this->pagehook, array( $this, 'scripts' ) ); 
    553556        add_action( 'load-'.$this->pagehook, array( $this, 'metaboxes' ) ); 
    554557        // setup layout 
  • scribe/trunk/lib/history/scribe.php

    r614019 r642313  
    6666        function addAdminInterfaceItems() { 
    6767 
    68 //          add_options_page(__('Scribe Settings'), __('Scribe Settings'), 'manage_options', 'scribe', array(&$this, 'displaySettingsPage')); 
    69  
    7068            $permission = $this->getPermissionLevel(); 
    7169 
    7270            if(current_user_can($permission)) { 
    7371                $dependency = $this->getEcordiaDependency(); 
    74                 $title = __('Scribe v3 Score'); 
     72                $title = esc_html__('Scribe v3 Score', 'scribeseo'); 
    7573                $displayFunction = array(&$this, 'displayMetaBox'); 
    7674 
    77                 foreach($this->getSupportedPostTypes() as $type) { 
    78 //                  add_meta_box('ecordia-keyword-research', __('Scribe Keyword Research'), array(&$this, 'displayKeywordResearchMetaBox'), $type, 'side', 'core'); 
     75                foreach($this->getSupportedPostTypes() as $type) 
    7976                    add_meta_box('ecordia', $title, $displayFunction, $type, 'side', 'core'); 
    80 //                  add_meta_box('ecordia-link-building', __('Scribe Link Building'), array(&$this, 'displayLinkBuildingMetaBox'), $type, 'side', 'core'); 
    81                 } 
     77 
    8278            } 
    8379 
     
    8682                wp_enqueue_style('ecordia'); 
    8783                wp_enqueue_script('ecordia'); 
    88 //              add_filter('tiny_mce_before_init', array(&$this, 'addInitInstanceCallback')); 
    8984            } 
    9085        } 
     
    205200 
    206201        function thickboxTabs($tabs) { 
    207             $pages = array('ecordia-score'=>__('SEO Score'), 'ecordia-keyword-analysis'=>__('Keyword Analysis'), 'ecordia-change-keywords'=>__('Change Keywords'), 'ecordia-keyword-alternates'=>__('Alternate Keywords'), 'ecordia-tags'=>__('Tags'), 'ecordia-serp'=>__('SERP'), 'ecordia-seo-best-practices'=>__('SEO Best Practices')); 
     202            $pages = array( 
     203                'ecordia-score' => esc_html__('SEO Score', 'scribeseo'),  
     204                'ecordia-keyword-analysis' => esc_html__('Keyword Analysis', 'scribeseo'),  
     205                'ecordia-change-keywords' => esc_html__('Change Keywords', 'scribeseo'),  
     206                'ecordia-keyword-alternates' => esc_html__('Alternate Keywords', 'scribeseo'),  
     207                'ecordia-tags' => esc_html__('Tags', 'scribeseo'),  
     208                'ecordia-serp' => esc_html__('SERP', 'scribeseo'),  
     209                'ecordia-seo-best-practices' => esc_html__('SEO Best Practices', 'scribeseo') 
     210            ); 
    208211            if( defined( 'ECORDIA_DEBUG' ) && ECORDIA_DEBUG ) { 
    209                 $pages['ecordia-debug'] = __( 'Debug Info' ); 
     212                $pages['ecordia-debug'] = esc_html__( 'Debug Info' , 'scribeseo'); 
    210213            } 
    211214            return $pages; 
    212215        } 
    213216        function linkBuildingThickboxTabs($tabs) { 
    214             return array('ecordia-link-building-external'=>__('External Links'), 'ecordia-link-building-internal'=>__('Internal Links'), 'ecordia-link-building-social'=>__('Social Media')); 
     217            return array( 
     218                'ecordia-link-building-external' => esc_html__('External Links', 'scribeseo'),  
     219                'ecordia-link-building-internal' => esc_html__('Internal Links', 'scribeseo'),  
     220                'ecordia-link-building-social' => esc_html__('Social Media', 'scribeseo') 
     221            ); 
    215222        } 
    216223 
     
    251258            switch( $automatic ) { 
    252259                case 'aioseo': 
    253                     $currently = __( 'All in One SEO Pack Plugin' ); 
     260                    $currently = esc_html__( 'All in One SEO Pack Plugin' , 'scribeseo'); 
    254261                    break; 
    255262                case 'headwa': 
    256                     $currently = __( 'Headway Theme' ); 
     263                    $currently = esc_html__( 'Headway Theme' , 'scribeseo'); 
    257264                    break; 
    258265                case 'hybrid': 
    259                     $currently = __( 'Hybrid Theme' ); 
     266                    $currently = esc_html__( 'Hybrid Theme' , 'scribeseo'); 
    260267                    break; 
    261268                case 'genesis': 
    262                     $currently = __( 'Genesis Theme' ); 
     269                    $currently = esc_html__( 'Genesis Theme' , 'scribeseo'); 
    263270                    break; 
    264271                case 'thesis': 
    265                     $currently = __( 'Thesis Theme' ); 
     272                    $currently = esc_html__( 'Thesis Theme' , 'scribeseo'); 
    266273                    break; 
    267274                case 'fvaioseo': 
    268                     $currently = __( 'FV All in One SEO Pack' ); 
     275                    $currently = esc_html__( 'FV All in One SEO Pack' , 'scribeseo'); 
    269276                    break; 
    270277                case 'woothemes': 
    271                     $currently = __( 'WooThemes' ); 
     278                    $currently = esc_html__( 'WooThemes' , 'scribeseo'); 
    272279                    break; 
    273280                default: 
    274                     $currently = sprintf( __( '<span class="ecordia-error">unable to detected theme/plugin</span>.  Please select the "Choose the SEO tool" option below. To see a list of compatible plugins and themes go to <a href="%1$s" target="_blank">http://scribeseo.com/compatibility</a>.' ), 'http://scribeseo.com/compatibility' ); 
     281                    $currently = sprintf( '<span class="ecordia-error">%1$s</span>.  %2$s <a href="http://scribeseo.com/compatibility" target="_blank">http://scribeseo.com/compatibility</a>.', esc_html__( 'unable to detected theme/plugin', 'scribeseo' ), esc_html__( 'Please select the "Choose the SEO tool" option below. To see a list of compatible plugins and themes go to ' , 'scribeseo' ) ); 
    275282                    break; 
    276283            } 
     
    486493 
    487494                delete_option( $this->_option_cachedUserResults ); 
    488                 return new WP_Error(-1, __('You must set an API key.')); 
     495                return new WP_Error(-1, esc_html__('You must set an API key.', 'scribeseo')); 
    489496 
    490497            } 
     
    500507            } elseif ( ! $userAccountAccess->has_results() ) { 
    501508 
    502                 return new WP_Error(-100, __('Fetching Information...')); 
     509                return new WP_Error(-100, esc_html__('Fetching Information...', 'scribeseo')); 
    503510 
    504511            } 
     
    537544 
    538545        function getPostTypes() { 
    539             global $wp_version; 
    540             if(version_compare($wp_version,'3','>=')) { 
    541                 return get_post_types(array('show_ui'=>true), 'objects'); 
    542             } else { 
    543                 $post = new stdClass; 
    544                 $post->labels = new stdClass; 
    545                 $post->labels->name = __('Posts'); 
    546  
    547                 $page = new stdClass; 
    548                 $page->labels = new stdClass; 
    549                 $page->labels->name = __('Pages'); 
    550  
    551                 return array('post'=>$post, 'page'=>$page); 
    552             } 
     546            // Scribe now requires WP 3.3 or higher 
     547            return get_post_types( array( 'show_ui'=>true ), 'objects' ); 
    553548        } 
    554549    } 
  • scribe/trunk/lib/history/views/meta-box/after.php

    r614019 r642313  
    1212<div> 
    1313    <div id="ecordia-review-score"> 
    14         <p><strong><?php _e( 'Content Score' ); ?></strong></p> 
    15         <p><strong id="ecordia-review-score-number" class="<?php echo sanitize_html_class( $this->getSeoScoreClassForPost( $score ) ); ?>"><?php printf( __( '%1$d%%' ), $score ); ?></strong></p> 
     14        <p><strong><?php esc_html_e( 'Content Score' , 'scribeseo'); ?></strong></p> 
     15        <p><strong id="ecordia-review-score-number" class="<?php echo sanitize_html_class( $this->getSeoScoreClassForPost( $score ) ); ?>"><?php printf( esc_html__( '%1$d%%' , 'scribeseo'), $score ); ?></strong></p> 
    1616    </div> 
    1717    <div id="ecordia-review-keywords"> 
    18         <p><strong><?php _e( 'Primary Keywords' ); ?></strong></p> 
     18        <p><strong><?php esc_html_e( 'Primary Keywords' , 'scribeseo'); ?></strong></p> 
    1919        <?php if( empty( $primaryKeywords ) ) { ?> 
    20         <p class="ecordia-error"><?php _e( 'No Primary Keywords Found.'); ?></p> 
     20        <p class="ecordia-error"><?php esc_html_e( 'No Primary Keywords Found.', 'scribeseo'); ?></p> 
    2121        <?php } else { ?> 
    2222        <ul style="margin-left: 6px;"> 
     
    3333    <div class="alignleft"> 
    3434        <p> 
    35             <a href="<?php echo esc_url( admin_url( 'media-upload.php?tab=ecordia-score&type=ecordia-score&post=' . $post->ID . '&TB_iframe=true' ) ); ?>" id="ecordia-seo-analysis-review-button" class="button"><?php _e( 'Review' ); ?></a> 
     35            <a href="<?php echo esc_url( admin_url( 'media-upload.php?tab=ecordia-score&type=ecordia-score&post=' . $post->ID . '&TB_iframe=true' ) ); ?>" id="ecordia-seo-analysis-review-button" class="button"><?php esc_html_e( 'Review' , 'scribeseo'); ?></a> 
    3636        </p> 
    3737    </div> 
  • scribe/trunk/lib/history/views/meta-box/before.php

    r614019 r642313  
    11<div class="ecordia-analyze-action"> 
    22    <div class="alignleft scribe-average scribe-analysis-meta-box-score"> 
    3             <?php _e( 'N/A', 'scribeseo' ); ?> 
     3            <?php esc_html_e( 'N/A', 'scribeseo' ); ?> 
    44    </div> 
    55    <br class="clear" /> 
  • scribe/trunk/lib/history/views/meta-box/error.php

    r614019 r642313  
    11<p> 
    2     <?php printf( __( 'The Scribe plugin is not configured correctly.  Please check the <a target="_blank" href="%s">plugin settings</a> page for more details.' ), esc_url( admin_url('options-general.php?page=scribe' ) ) ); ?> 
     2    <?php printf( __( 'The Scribe plugin is not configured correctly.  Please check the <a target="_blank" href="%s">plugin settings</a> page for more details.' , 'scribeseo'), esc_url( admin_url('options-general.php?page=scribe' ) ) ); ?> 
    33</p> 
  • scribe/trunk/lib/history/views/meta-box/validation-list.php

    r614019 r642313  
    11<ul id="ecordia-seo-analysis-requirement-list"> 
    2     <li id="ecordia-seo-analysis-requirement-title" class="incomplete"><span class="incomplete"><?php _e( 'Custom Title Tag Required' ); ?></span><span class="complete"><?php _e( 'Title Tag Ready' ); ?></span></li> 
    3     <li id="ecordia-seo-analysis-requirement-description" class="incomplete"><span class="incomplete"><?php _e( 'Meta Description Required' ); ?></span><span class="complete"><?php _e( 'Meta Description Ready' ); ?></span></li> 
    4     <li id="ecordia-seo-analysis-requirement-content" class="incomplete"><span class="incomplete"><?php _e( 'Content Required' ); ?></span><span class="complete"><?php _e( 'Content Ready' ); ?></span></li> 
     2    <li id="ecordia-seo-analysis-requirement-title" class="incomplete"><span class="incomplete"><?php esc_html_e( 'Custom Title Tag Required' , 'scribeseo'); ?></span><span class="complete"><?php esc_html_e( 'Title Tag Ready' , 'scribeseo'); ?></span></li> 
     3    <li id="ecordia-seo-analysis-requirement-description" class="incomplete"><span class="incomplete"><?php esc_html_e( 'Meta Description Required' , 'scribeseo'); ?></span><span class="complete"><?php esc_html_e( 'Meta Description Ready' , 'scribeseo'); ?></span></li> 
     4    <li id="ecordia-seo-analysis-requirement-content" class="incomplete"><span class="incomplete"><?php esc_html_e( 'Content Required' , 'scribeseo'); ?></span><span class="complete"><?php esc_html_e( 'Content Ready' , 'scribeseo'); ?></span></li> 
    55</ul> 
  • scribe/trunk/lib/history/views/popup/alternate-keyword-table.php

    r614019 r642313  
    44} else { 
    55    $no_data = true; 
    6     $no_data_text = __('No alternate keywords found'); 
     6    $no_data_text = __('No alternate keywords found', 'scribeseo'); 
    77    $denom = 1; 
    88} 
     
    1111    <thead> 
    1212        <tr> 
    13             <th scope="col"><?php _e('Alternate Keyword Suggestions'); ?></th> 
    14             <th scope="col"><?php _e('Relative Search Frequency'); ?></th> 
     13            <th scope="col"><?php esc_html_e('Alternate Keyword Suggestions', 'scribeseo'); ?></th> 
     14            <th scope="col"><?php esc_html_e('Relative Search Frequency', 'scribeseo'); ?></th> 
    1515        </tr> 
    1616    </thead> 
    1717    <tfoot> 
    1818        <tr> 
    19             <th scope="col"><?php _e('Alternate Keyword Suggestions'); ?></th> 
    20             <th scope="col"><?php _e('Relative Search Frequency'); ?></th> 
     19            <th scope="col"><?php esc_html_e('Alternate Keyword Suggestions', 'scribeseo'); ?></th> 
     20            <th scope="col"><?php esc_html_e('Relative Search Frequency', 'scribeseo'); ?></th> 
    2121        </tr> 
    2222    </tfoot> 
  • scribe/trunk/lib/history/views/popup/error.php

    r614019 r642313  
    99        <?php 
    1010        if( 'show-settings-prompt' == $extended ) { 
    11             _e( 'Upgrade your Ecordia account under Settings.' ); 
     11            _e( 'Upgrade your Ecordia account under Settings.' , 'scribeseo'); 
    1212            ?> 
    13             <br /><a id="ecordia-setttings-page-from-thickbox" target="_blank" href="<?php echo esc_url( admin_url( 'options-general.php?page=ecordia' ) ); ?>"><?php _e( 'Go to Settings' ); ?></a>&nbsp;&nbsp;<a href="#" class="ecordia-close-thickbox"><?php _e( 'Close' ); ?></a> 
     13            <br /><a id="ecordia-setttings-page-from-thickbox" target="_blank" href="<?php echo esc_url( admin_url( 'options-general.php?page=ecordia' ) ); ?>"><?php _e( 'Go to Settings' , 'scribeseo'); ?></a>&nbsp;&nbsp;<a href="#" class="ecordia-close-thickbox"><?php _e( 'Close' , 'scribeseo'); ?></a> 
    1414            <?php 
    1515        } else { 
    1616            echo esc_html( $extended ); 
    1717            ?> 
    18             <br /><a href="#" class="ecordia-close-thickbox"><?php _e( 'Close' ); ?></a> 
     18            <br /><a href="#" class="ecordia-close-thickbox"><?php _e( 'Close' , 'scribeseo'); ?></a> 
    1919            <?php 
    2020        } 
  • scribe/trunk/lib/history/views/popup/keyword-alternates.php

    r614019 r642313  
    3030    ?> 
    3131    <p> 
    32         <?php _e('No Primary, Important, or Significant keywords found.'); ?> 
     32        <?php _e('No Primary, Important, or Significant keywords found.', 'scribeseo'); ?> 
    3333    </p> 
    3434    <?php 
     
    3939    </p> 
    4040    <div id="scribe-content-keywords-container"> 
    41         <p><strong><?php _e('Click a keyword below to see alternate suggestions.'); ?></strong></p> 
     41        <p><strong><?php _e('Click a keyword below to see alternate suggestions.', 'scribeseo'); ?></strong></p> 
    4242        <ul id="scribe-content-keywords"> 
    4343            <?php foreach((array)$properKeywords as $number => $keyword) { ?> 
     
    5151            <thead> 
    5252                <tr> 
    53                     <th scope="col"><?php _e('Fetching alternate keywords...'); ?></th> 
     53                    <th scope="col"><?php _e('Fetching alternate keywords...', 'scribeseo'); ?></th> 
    5454                </tr> 
    5555            </thead> 
  • scribe/trunk/lib/history/views/popup/keyword-analysis.php

    r614019 r642313  
    44?> 
    55<form method="post"> 
    6     <h3><?php _e( 'Contextual Analysis' ); ?></h3> 
     6    <h3><?php esc_html_e( 'Contextual Analysis' , 'scribeseo'); ?></h3> 
    77    <p> 
    88        <?php echo esc_html( $keywordInfo['Description'] ); ?> 
     
    1919                            echo esc_html( $keywordDescription['Value'] ); 
    2020                        } elseif( count( $primaryKeywords ) == 1 ) { 
    21                             printf(__('The term %s is emphasized within your content and is considered a Primary Keyword.' ), '<strong>' . esc_html( $primaryKeywords[0] ) . '</strong>' ); 
     21                            printf(esc_html__('The term %s is emphasized within your content and is considered a Primary Keyword.' , 'scribeseo'), '<strong>' . esc_html( $primaryKeywords[0] ) . '</strong>' ); 
    2222                        } elseif(count($primaryKeywords)==2) { 
    23                             printf(__('The terms %s and %s are emphasized within your content and are considered Primary Keywords.'),'<strong>' . esc_html( $primaryKeywords[0] ) . '</strong>','<strong>' . esc_html( $primaryKeywords[1] ) . '</strong>'); 
     23                            printf(esc_html__('The terms %s and %s are emphasized within your content and are considered Primary Keywords.', 'scribeseo'),'<strong>' . esc_html( $primaryKeywords[0] ) . '</strong>','<strong>' . esc_html( $primaryKeywords[1] ) . '</strong>'); 
    2424                        } else { 
    2525                            $primaryKeywords = array_map( 'esc_html', $primaryKeywords ); 
    2626                            $last = array_pop($primaryKeywords); 
    27                             printf(__('The terms %s, and %s are emphasized within your content and are considered Primary Keywords.'),'<strong>' . implode('</strong>, <strong>', $primaryKeywords) . '</strong>',"<strong>{$last}</strong>"); 
     27                            printf(esc_html__('The terms %s, and %s are emphasized within your content and are considered Primary Keywords.', 'scribeseo'),'<strong>' . implode('</strong>, <strong>', $primaryKeywords) . '</strong>',"<strong>{$last}</strong>"); 
    2828                        } 
    2929                        ?> 
     
    4040        </tbody> 
    4141    </table> 
    42     <h3><?php _e( 'Keyword Analysis' ); ?></h3> 
     42    <h3><?php esc_html_e( 'Keyword Analysis' , 'scribeseo'); ?></h3> 
    4343    <p> 
    4444        <?php echo esc_html( $analysisInfo['Description'] ); ?> 
     
    4747        <thead> 
    4848            <tr> 
    49                 <th scope="col"><?php _e( 'Keywords' ); ?></th> 
    50                 <th scope="col"><?php _e( 'Rank' ); ?></th> 
    51                 <th scope="col"><?php _e( 'Prominence' ); ?></th> 
    52                 <th scope="col"><?php _e( 'Frequency' ); ?></th> 
    53                 <th scope="col"><?php _e( 'Density' ); ?></th> 
     49                <th scope="col"><?php esc_html_e( 'Keywords' , 'scribeseo'); ?></th> 
     50                <th scope="col"><?php esc_html_e( 'Rank' , 'scribeseo'); ?></th> 
     51                <th scope="col"><?php esc_html_e( 'Prominence' , 'scribeseo'); ?></th> 
     52                <th scope="col"><?php esc_html_e( 'Frequency' , 'scribeseo'); ?></th> 
     53                <th scope="col"><?php esc_html_e( 'Density' , 'scribeseo'); ?></th> 
    5454            </tr> 
    5555        </thead> 
     
    5757            <?php if( !is_array($keywordInfo['Keywords']['Keyword'] ) ) { ?> 
    5858                <tr class="normal"> 
    59                     <td colspan="6" style="text-align: center;"><?php _e( 'No keywords found.' ); ?></td> 
     59                    <td colspan="6" style="text-align: center;"><?php esc_html_e( 'No keywords found.' , 'scribeseo'); ?></td> 
    6060                </tr> 
    6161            <?php } else {  
  • scribe/trunk/lib/history/views/popup/score.php

    r614019 r642313  
    1717        <thead> 
    1818            <tr> 
    19                 <th scope="col"><?php _e( 'Overall' ); ?></th> 
    20                 <th scope="col"><?php _e( 'Content' ); ?></th> 
    21                 <th scope="col"><?php _e( 'Analysis &amp; Recommendations' ); ?></th> 
     19                <th scope="col"><?php esc_html_e( 'Overall' , 'scribeseo'); ?></th> 
     20                <th scope="col"><?php esc_html_e( 'Content' , 'scribeseo'); ?></th> 
     21                <th scope="col"><?php esc_html_e( 'Analysis &amp; Recommendations' , 'scribeseo'); ?></th> 
    2222            </tr> 
    2323        </thead> 
     
    2525            <tr> 
    2626                <td id="ecordia-score-analysis-overview" class="ecordia-middle-cell <?php echo sanitize_html_class( $this->getSeoScoreClassForPost( $scoreInfo['Score']['Value'] ) ); ?>-background" rowspan="<?php echo esc_attr( $sectionCount ); ?>"> 
    27                     <div id="overall-score-analysis"><?php printf( __( '%d%%' ), $scoreInfo['Score']['Value']); ?></div> 
     27                    <div id="overall-score-analysis"><?php printf( esc_html__( '%d%%' , 'scribeseo'), $scoreInfo['Score']['Value']); ?></div> 
    2828                    <p><?php echo esc_html( $scoreInfo['Score']['Description'] ); ?></p> 
    2929                </td> 
  • scribe/trunk/lib/scribe-api.php

    r614019 r642313  
    389389             
    390390            if(empty($this->_api_key) && $verify_key) { 
    391                 return new WP_Error('scribe_api_empty_api_key', __('An API Key must be provided in order to make requests from the Scribe SEO API service.')); 
     391                return new WP_Error('scribe_api_empty_api_key', __('An API Key must be provided in order to make requests from the Scribe SEO API service.', 'scribeseo')); 
    392392            } 
    393393             
     
    397397                $request_url = trailingslashit( $request_url ); 
    398398             
    399             $get_data = array_merge(array('apikey' => $this->_api_key), $get_data); 
    400             $request_url = add_query_arg($get_data, $request_url); 
     399            $get_data = array_map( 'urlencode', array_merge( array( 'apikey' => $this->_api_key ), $get_data ) ); 
     400update_option( 'aa', $get_data ); 
     401            $request_url = add_query_arg( $get_data, $request_url ); 
    401402             
    402403            if($is_post || !empty($post_data)) { 
     
    413414                $object = @self::urldecode_json_decode($body); 
    414415                if(null === $object) { 
    415                     $result = new WP_Error('scribe_api_could_not_decode_response', __('The system could not decode the response from the Scribe SEO API server.')); 
     416                    $result = new WP_Error('scribe_api_could_not_decode_response', __('The system could not decode the response from the Scribe SEO API server.', 'scribeseo')); 
    416417                } else { 
    417418                    $result = $object; 
     
    439440            if(is_object($item)) { 
    440441                foreach($item as $property => $value) { 
    441                     $item->{$property} = self::recursive_urlencode($value); 
     442                    $item->$property = self::recursive_urlencode($value); 
    442443                } 
    443444                 
     
    455456            if(is_object($item)) { 
    456457                foreach($item as $property => $value) { 
    457                     $item->{$property} = self::recursive_urldecode($value); 
     458                    $item->$property = self::recursive_urldecode($value); 
    458459                } 
    459460                 
  • scribe/trunk/lib/scribe-connector.php

    r614019 r642313  
    1818        $methods['scribe.getPost'] = array( __CLASS__, 'getPost' ); 
    1919        $methods['scribe.getPosts'] = array( __CLASS__, 'getPosts' ); 
     20        $methods['scribe.getPostsLimit'] = array( __CLASS__, 'getPostsLimit' ); 
    2021        $methods['scribe.editPost'] = array( __CLASS__, 'editPost' ); 
    2122 
     
    6465    function getPosts( $args ) { 
    6566 
     67        return self::getPostsBy( 'date', $args ); 
     68 
     69    } 
     70    function getPostsLimit( $args ) { 
     71 
     72        return self::getPostsBy( 'id', $args ); 
     73 
     74    } 
     75    function getPostsBy( $field, $args ) { 
     76 
    6677        global $wp_xmlrpc_server, $wpdb; 
    6778 
     
    7081            return $wp_xmlrpc_server->wp_getPosts( $args ); 
    7182 
    72         // if a valide date is not passed return the default xml-rpc get posts 
    73         $since = strtotime( $args[3] ); 
    74         if ( $since < 1 ) 
    75             return $wp_xmlrpc_server->wp_getPosts( $args ); 
     83        if ( $field == 'date' ) { 
    7684 
     85            // if a valide date is not passed return the default xml-rpc get posts 
     86            $since = strtotime( $args[3] ); 
     87            if ( $since < 1 ) 
     88                return $wp_xmlrpc_server->wp_getPosts( $args ); 
     89 
     90            $where = $wpdb->prepare( '(post_date >= %s OR post_modified >= %s) AND ', $since, $since ); 
     91            $order = 'post_date DESC'; 
     92            $limit = ''; 
     93 
     94        } else { 
     95 
     96            if ( ! (int) $args[3] ) 
     97                return $wp_xmlrpc_server->wp_getPosts( $args ); 
     98 
     99            $where = $wpdb->prepare( 'ID >= %d AND ', $args[3] ); 
     100            $order = 'ID ASC'; 
     101            $limit = 'LIMIT 0, 10'; 
     102        } 
     103             
    77104        // get post ids 
    78105        $post_types = Scribe_SEO::get_option( 'post-types' ); 
     
    81108 
    82109        $since = date( 'Y-m-d', $since ); 
    83         $post_list = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE ( post_date >= %s OR post_modified >= %s) AND post_type IN ('" . implode( "','", $post_types ) . "') AND post_status != 'auto-draft' ORDER BY post_date DESC", $since, $since ) ); 
     110        $post_list = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} WHERE $where post_type IN ('" . implode( "','", $post_types ) . "') AND post_status != 'auto-draft' ORDER BY $order $limit" ); 
    84111        if ( ! $post_list ) 
    85112            return array(); 
  • scribe/trunk/lib/scribe-display-helpers.php

    r614019 r642313  
    6666 
    6767function scribe_get_keyword_analysis_score_text($score) { 
    68     return apply_filters('scribe_get_keyword_analysis_score_text', scribe_get_content_for_letter_score($score, __('Congratulations, this term strikes a good balance between search optimization and copywriting best practices.'), __('You\'re close! This keyword requires a bit more work to reach the correct balance between search optimization and copywriting best practices.'), __('You need to integrate this keyword more closely into your copy to achieve a better score and make it more relevant.'), __('Please reevaluate your use of this keyword to improve its ranking.'))); 
     68    return apply_filters( 'scribe_get_keyword_analysis_score_text',  
     69        scribe_get_content_for_letter_score( 
     70            $score, 
     71            __( 'Congratulations, this term strikes a good balance between search optimization and copywriting best practices.', 'scribeseo' ), 
     72            __( 'You\'re close! This keyword requires a bit more work to reach the correct balance between search optimization and copywriting best practices.', 'scribeseo' ), 
     73            __( 'You need to integrate this keyword more closely into your copy to achieve a better score and make it more relevant.', 'scribeseo' ), 
     74            __( 'Please reevaluate your use of this keyword to improve its ranking.', 'scribeseo' ) 
     75        ) 
     76    ); 
    6977} 
    7078 
     
    216224        return apply_filters('scribe_get_link_building_score_description', __( 'Getting connections to your site for the term <strong>%s</strong> will be difficult. <a href="http://www.copyblogger.com/content-marketing" target="_blank">Click here</a> to study a few useful tutorials that will help you write the kind of content your audience is looking for. ', 'scribeseo' ) ); 
    217225 
    218     return apply_filters('scribe_get_link_building_score_description', scribe_get_content_for_score($score, __('You have plenty of connections for the phrase you\'ve chosen.'), __('You have a lot of connections, but need more for this phrase.'), __('You need to generate a lot more connections for this phrase.'), 'link')); 
     226    return apply_filters('scribe_get_link_building_score_description', 
     227        scribe_get_content_for_score( 
     228            $score, 
     229            __( 'You have plenty of connections for the phrase you\'ve chosen.', 'scribeseo' ), 
     230            __( 'You have a lot of connections, but need more for this phrase.', 'scribeseo' ), 
     231            __( 'You need to generate a lot more connections for this phrase.', 'scribeseo' ), 
     232            'link' 
     233        ) 
     234    ); 
    219235} 
    220236 
    221237function scribe_get_overall_score_description($score) { 
    222     return apply_filters( 'scribe_get_overall_score_description', scribe_get_content_for_score( $score, __( 'It will not be difficult for you to rank on a search engine for this keyword.', 'scribeseo' ), __( 'This term will be somewhat difficult for you to rank for on a search engine.', 'scribeseo' ), '', 'overall' ) ); 
     238    return apply_filters( 'scribe_get_overall_score_description', 
     239        scribe_get_content_for_score( 
     240            $score, 
     241            __( 'It will not be difficult for you to rank on a search engine for this keyword.', 'scribeseo' ), 
     242            __( 'This term will be somewhat difficult for you to rank for on a search engine.', 'scribeseo' ), 
     243            '', 
     244            'overall' 
     245        ) 
     246    ); 
    223247} 
    224248 
     
    228252 
    229253function scribe_get_content_score_description($score) { 
    230     return apply_filters('scribe_get_content_score_description', scribe_get_content_for_score($score, __('Great! You have an awesome score!'), __('Consider adding more content to your site for this term.', 'scribeseo' ), __( 'Your site exceeds the amount of content for this term for sites that are ranking.', 'scribeseo' ) ) ); 
     254    return apply_filters( 'scribe_get_content_score_description', 
     255        scribe_get_content_for_score( 
     256            $score, 
     257            __( 'Great! You have an awesome score!', 'scribeseo'), 
     258            __( 'Consider adding more content to your site for this term.', 'scribeseo' ), 
     259            __( 'Your site exceeds the amount of content for this term for sites that are ranking.', 'scribeseo' ) 
     260        ) 
     261    ); 
    231262} 
    232263 
     
    240271 
    241272function scribe_get_link_score_description($score) { 
    242     return apply_filters('scribe_get_link_score_description', scribe_get_content_for_score($score, __('Great! You have an awesome score!'), __('You will need to obtain more links to your site for this term.'), __('Your site exceeds the number of links for sites that currently rank for this term.' ) ) ); 
     273    return apply_filters( 'scribe_get_link_score_description', 
     274        scribe_get_content_for_score( 
     275            $score, 
     276            __( 'Great! You have an awesome score!', 'scribeseo' ), 
     277            __( 'You will need to obtain more links to your site for this term.', 'scribeseo' ), 
     278            __( 'Your site exceeds the number of links for sites that currently rank for this term.', 'scribeseo' ) 
     279        ) 
     280    ); 
    243281} 
    244282 
     
    252290 
    253291function scribe_get_domain_authority_score_description($score) { 
    254     return apply_filters('scribe_get_domain_authority_score_description', scribe_get_content_for_score($score, __('Great! You have an awesome score!'), __('You should obtain more links for this term from sites that have strong authority.'), __('Your site’s authority exceeds the authority of most sites that rank for this term.'))); 
     292    return apply_filters( 'scribe_get_domain_authority_score_description', 
     293        scribe_get_content_for_score( 
     294            $score, 
     295            __( 'Great! You have an awesome score!', 'scribeseo' ), 
     296            __( 'You should obtain more links for this term from sites that have strong authority.', 'scribeseo' ), 
     297            __( 'Your site’s authority exceeds the authority of most sites that rank for this term.', 'scribeseo' ) 
     298        ) 
     299    ); 
    255300} 
    256301 
     
    264309 
    265310function scribe_get_facebook_likes_score_description($score) { 
    266     return apply_filters('scribe_get_facebook_likes_score_description', scribe_get_content_for_score($score, __('Great! You have an awesome score!'), __('You should have more people sharing your content online in order to rank well for this term.'), __('Your site’s content for this term is highly socialized.'))); 
     311    return apply_filters('scribe_get_facebook_likes_score_description', 
     312        scribe_get_content_for_score( 
     313            $score, 
     314            __( 'Great! You have an awesome score!', 'scribeseo' ), 
     315            __( 'You should have more people sharing your content online in order to rank well for this term.', 'scribeseo' ), 
     316            __( 'Your site’s content for this term is highly socialized.', 'scribeseo' ) 
     317        ) 
     318    ); 
    267319} 
    268320 
  • scribe/trunk/lib/scribe-google.php

    r614019 r642313  
    2424             
    2525            if ( empty( $search_term ) ) 
    26                 return new WP_Error('empty_term', __('Please provide a search term.')); 
     26                return new WP_Error('empty_term', __('Please provide a search term.', 'scribeseo')); 
    2727 
    2828            $response = wp_remote_get( add_query_arg( array( 'q' => urlencode( $search_term ) ), self::ENDPOINT ) ); 
     
    3333            $result = array(); 
    3434 
    35             $complete_suggestions = @simplexml_load_string( wp_remote_retrieve_body( $response ) ); 
     35            // turn on user error handing 
     36            $user_errors = libxml_use_internal_errors( true ); 
     37            $complete_suggestions = simplexml_load_string( wp_remote_retrieve_body( $response ) ); 
     38            // get any errors 
     39            $xml_errors = libxml_get_errors(); 
     40            // restore error handling setting 
     41            libxml_use_internal_errors( $user_errors ); 
     42            if ( ! empty( $xml_errors ) ) 
     43                return new WP_Error('xml_error', __('The XML from the Google Completion API could not be loaded appropriately.', 'scribeseo')); 
     44 
    3645            $complete_suggestions_po = json_decode( json_encode( $complete_suggestions ) ); 
    3746 
    3847            if ( ! is_object( $complete_suggestions_po ) || ! isset( $complete_suggestions_po->CompleteSuggestion ) ) 
    39                 return new WP_Error('xml_error', __('The XML from the Google Completion API could not be loaded appropriately.')); 
     48                return new WP_Error('xml_error', __('The XML from the Google Completion API could not be loaded appropriately.', 'scribeseo')); 
    4049 
    4150            foreach( $complete_suggestions_po->CompleteSuggestion as $suggestion ) { 
  • scribe/trunk/lib/scribe-support.php

    r614019 r642313  
    1515 
    1616        private function register_tests() { 
    17             $this->register_test(__('WordPress Version'), array(__CLASS__, 'get_wordpress_version')); 
    18             $this->register_test(__('PHP Version'), array(__CLASS__, 'get_php_version')); 
    19             $this->register_test(__('Scribe Installed?'), array(__CLASS__, 'is_scribe_installed')); 
    20             $this->register_test(__('Scribe Version'), array(__CLASS__, 'get_scribe_version')); 
    21             $this->register_test(__('Scribe API Key'), array(__CLASS__, 'get_scribe_api_key')); 
    22             $this->register_test(__('Activated Dependency'), array(__CLASS__, 'get_activated_dependency')); 
    23             $this->register_test(__('SSL Connect'), array(__CLASS__, 'get_connect_via_ssl')); 
    24             $this->register_test(__('Non-SSL Connect'), array(__CLASS__, 'get_connect_via_non_ssl')); 
    25             $this->register_test(__('Web Server'), array(__CLASS__, 'get_web_server')); 
    26             $this->register_test(__('Server IP'), array(__CLASS__, 'get_ip_address')); 
    27             $this->register_test(__('Installed Themes'), array(__CLASS__, 'get_installed_themes')); 
    28             $this->register_test(__('Activated Theme'), array(__CLASS__, 'get_activated_theme')); 
    29             $this->register_test(__('Installed Plugins'), array(__CLASS__, 'get_installed_plugins')); 
    30             $this->register_test(__('Activated Plugins'), array(__CLASS__, 'get_activated_plugins')); 
     17            $this->register_test(__('WordPress Version', 'scribeseo'), array(__CLASS__, 'get_wordpress_version')); 
     18            $this->register_test(__('PHP Version', 'scribeseo'), array(__CLASS__, 'get_php_version')); 
     19            $this->register_test(__('Scribe Installed?', 'scribeseo'), array(__CLASS__, 'is_scribe_installed')); 
     20            $this->register_test(__('Scribe Version', 'scribeseo'), array(__CLASS__, 'get_scribe_version')); 
     21            $this->register_test(__('Scribe API Key', 'scribeseo'), array(__CLASS__, 'get_scribe_api_key')); 
     22            $this->register_test(__('Activated Dependency', 'scribeseo'), array(__CLASS__, 'get_activated_dependency')); 
     23            $this->register_test(__('SSL Connect', 'scribeseo'), array(__CLASS__, 'get_connect_via_ssl')); 
     24            $this->register_test(__('Non-SSL Connect', 'scribeseo'), array(__CLASS__, 'get_connect_via_non_ssl')); 
     25            $this->register_test(__('Web Server', 'scribeseo'), array(__CLASS__, 'get_web_server')); 
     26            $this->register_test(__('Server IP', 'scribeseo'), array(__CLASS__, 'get_ip_address')); 
     27            $this->register_test(__('Installed Themes', 'scribeseo'), array(__CLASS__, 'get_installed_themes')); 
     28            $this->register_test(__('Activated Theme', 'scribeseo'), array(__CLASS__, 'get_activated_theme')); 
     29            $this->register_test(__('Installed Plugins', 'scribeseo'), array(__CLASS__, 'get_installed_plugins')); 
     30            $this->register_test(__('Activated Plugins', 'scribeseo'), array(__CLASS__, 'get_activated_plugins')); 
    3131        } 
    3232 
     
    3939                    $test_result = call_user_func($test['callback']); 
    4040 
    41                     $results[] = array('name' => $test['name'], 'value' => $test_result['value'], 'warn' => $test_result['warn']); 
     41                    $results[] = array('name' => esc_html( $test['name'] ), 'value' => esc_html( $test_result['value'] ), 'warn' => $test_result['warn']); 
    4242                } 
    4343            } 
     
    7575                    $dependency = $seo_tool_settings->name; 
    7676                } else { 
    77                     $dependency = __('Could not determine selected dependency.'); 
     77                    $dependency = __('Could not determine selected dependency.', 'scribeseo'); 
    7878                } 
    7979            } else { 
    80                 $dependency = __('Could not determine selected dependency.'); 
     80                $dependency = __('Could not determine selected dependency.', 'scribeseo'); 
    8181            } 
    8282 
     
    8989            $warn = is_wp_error($response); 
    9090            if(is_wp_error($response)) { 
    91                 $connect = __('Could not connect via SSL to api.scribeseo.com.'); 
     91                $connect = __('Could not connect via SSL to api.scribeseo.com.', 'scribeseo'); 
    9292            } else { 
    93                 $connect = __('Successfully connected via SSL to api.scribeseo.com'); 
     93                $connect = __('Successfully connected via SSL to api.scribeseo.com', 'scribeseo'); 
    9494            } 
    9595             
     
    102102            $warn = is_wp_error($response); 
    103103            if(is_wp_error($response)) { 
    104                 $connect = __('Could not connect via non-SSL to api.scribeseo.com.'); 
     104                $connect = __('Could not connect via non-SSL to api.scribeseo.com.', 'scribeseo'); 
    105105            } else { 
    106                 $connect = __('Successfully connected via non-SSL to api.scribeseo.com'); 
     106                $connect = __('Successfully connected via non-SSL to api.scribeseo.com', 'scribeseo'); 
    107107            } 
    108108             
     
    113113            $server = $_SERVER['SERVER_SOFTWARE']; 
    114114            if(empty($server)) { 
    115                 $server = __('Could not determine server software.'); 
     115                $server = __('Could not determine server software.', 'scribeseo'); 
    116116            } 
    117117             
     
    122122            $ip_address = $_SERVER['SERVER_ADDR']; 
    123123            if(empty($ip_address)) { 
    124                 $ip_address = __('Could not determine server IP.'); 
     124                $ip_address = __('Could not determine server IP.', 'scribeseo'); 
    125125            } 
    126126             
     
    131131            $installed = class_exists('Scribe_SEO'); 
    132132             
    133             return array('value' => $installed ? __('Yes') : __('No'), 'warn' => !$installed); 
     133            return array('value' => $installed ? __('Yes', 'scribeseo') : __('No', 'scribeseo'), 'warn' => !$installed); 
    134134        } 
    135135 
     
    138138                $version = Scribe_SEO::VERSION; 
    139139            } else { 
    140                 $version = __('Could not determine the Scribe SEO version.'); 
     140                $version = __('Could not determine the Scribe SEO version.', 'scribeseo'); 
    141141            } 
    142142 
     
    149149                $api_key = $settings['api-key']; 
    150150            } else { 
    151                 $api_key = __('Could not determine the Scribe API Key'); 
     151                $api_key = __('Could not determine the Scribe API Key', 'scribeseo'); 
    152152            } 
    153153 
     
    156156 
    157157        public static function get_installed_themes() { 
    158             $themes = get_themes(); 
     158            $themes = wp_get_themes(); 
    159159            $output = ''; 
    160160            foreach($themes as $item) { 
     
    166166         
    167167        public static function get_activated_theme() { 
    168             $theme = get_current_theme(); 
     168            $theme = wp_get_theme(); 
    169169             
    170170            return array('value' => $theme, 'warn' => false); 
  • scribe/trunk/readme.txt

    r614019 r642313  
    44Tags: content marketing, social media marketing, search marketing, keyword research, Scribe, SEO, Copyblogger, search engine optimization, content analysis, copywriting, Google, Bing, Yahoo, copy compass, seo copywriting, seo copy writing, text analyzer 
    55Requires at least: 3.3 
    6 Tested up to: 3.4.1 
    7 Stable tag: 4.0.9 
     6Tested up to: 3.5 
     7Stable tag: 4.0.10 
    88 
    99Scribe makes content marketing simple. 
  • scribe/trunk/scribe.php

    r614019 r642313  
    33 Plugin Name: Scribe 
    44 Plugin URI: http://scribecontent.com 
    5  Description: Increase your online traffic with Scribe – the intelligent content marketing tool for creative content producers . Scribe combines in-depth semantic keyword research, sophisticated content analysis and optimization tools, and targeted social media insights to help you focus your content marketing efforts. You will need a Scribe API Key in order to use the application. If you do not have an API Key, go to <a href="http://scribecontent.com" title="Get Scribe API Key">http://scribecontent.com</a>. Please make sure you are using a supported theme or plugin. For an updated list, go to <a href="http://scribecontent.com/compatibility/" title="Scribe Compatibility List">http://scribecontent.com/compatibility/</a>. 
    6  Version: 4.0.9 
     5 Description: Increase your online traffic with Scribe – the intelligent content marketing tool for creative content producers . Scribe combines in-depth semantic keyword research, sophisticated content analysis and optimization tools, and targeted social media insights to help you focus your content marketing efforts. You will need a Scribe API Key in order to use the application. If you do not have an API Key, go to <a href="http://scribecontent.com" title="Get Scribe API Key">http://scribecontent.com</a>. Please make sure you are using a supported theme or plugin. For an updated list, go to <a href="http://scribecontent.com/compatibility/" title="Scribe Compatibility List">http://scribecontent.com/compatibility/</a>. 
     6 Version: 4.0.10 
    77 Author: Copyblogger Media 
    88 Author URI: http://www.copyblogger.com 
     
    1414         
    1515        //// VERSION 
    16         const VERSION = '4.0.9'; 
     16        const VERSION = '4.0.10'; 
    1717         
    1818        //// KEYS 
     
    7575            require_once( SCRIBE_PLUGIN_DIR . 'lib/scribe-display-helpers.php' ); 
    7676            require_once( SCRIBE_PLUGIN_DIR . 'lib/scribe-google.php' ); 
    77             require_once( SCRIBE_PLUGIN_DIR . 'lib/scribe-support.php' ); 
     77 
     78            if ( ! self::is_hosted() ) 
     79                require_once( SCRIBE_PLUGIN_DIR . 'lib/scribe-support.php' ); 
    7880            require_once( SCRIBE_PLUGIN_DIR . 'lib/scribe-utility.php' ); 
    7981            require_once( SCRIBE_PLUGIN_DIR . 'lib/class-admin.php' ); 
     
    9294 
    9395            // check for update 
    94             self::update(); 
     96            if ( ! self::is_hosted() ) 
     97                self::update(); 
    9598 
    9699        } 
     
    104107            add_action( 'admin_menu', array( __CLASS__, 'modify_administrative_interface_items' ) ); 
    105108            // plugin updates 
    106             add_action( 'load-update-core.php', array( __CLASS__, 'delete_plugin_info' ) ); 
    107             add_filter( 'transient_update_plugins', array( __CLASS__, 'check_plugin_updates' ) ); 
    108             add_filter( 'site_transient_update_plugins', array( __CLASS__, 'check_plugin_updates' ) ); 
    109  
     109            if ( ! self::is_hosted() ) { 
     110 
     111                add_action( 'load-update-core.php', array( __CLASS__, 'delete_plugin_info' ) ); 
     112                add_filter( 'transient_update_plugins', array( __CLASS__, 'check_plugin_updates' ) ); 
     113                add_filter( 'site_transient_update_plugins', array( __CLASS__, 'check_plugin_updates' ) ); 
     114 
     115            } 
    110116            /// ANALYSIS POPUPS 
    111117            add_action( 'media_upload_scribe-analysis-keywords', array( __CLASS__, 'display_analysis_tabs' ) ); 
     
    202208                } 
    203209            } else { 
    204                 $results = array('error' => true, 'error_message' => __('Invalid request.')); 
     210                $results = array('error' => true, 'error_message' => __('Invalid request.', 'scribeseo')); 
    205211            } 
    206212             
     
    220226                $results = array('error' => false, 'post_id' => $post_id, 'user_id' => $user_id); 
    221227            } else { 
    222                 $results = array('error' => true, 'error_message' => __('Invalid request.')); 
     228                $results = array('error' => true, 'error_message' => __('Invalid request.', 'scribeseo')); 
    223229            } 
    224230             
     
    239245                $results = array('error' => false, 'post_id' => $post_id, 'user_id' => $user_id, 'target_term' => $target_term); 
    240246            } else { 
    241                 $results = array('error' => true, 'error_message' => __('Invalid request.')); 
     247                $results = array('error' => true, 'error_message' => __('Invalid request.', 'scribeseo')); 
    242248            } 
    243249             
     
    247253         
    248254        public static function ajax_handle_keyword_suggestions() { 
    249             $data = stripslashes_deep($_REQUEST); 
    250             $term = $data['term']; 
    251  
    252             $results = Scribe_Google::get_suggestions($term); 
    253             if(!is_array($results)) { 
     255 
     256            $data = stripslashes_deep( $_REQUEST ); 
     257            $term = isset( $data['term'] ) ? $data['term'] : ''; 
     258 
     259            if ( $term && isset( $data['scribe-keyword-suggestions-nonce'] ) && wp_verify_nonce( $data['scribe-keyword-suggestions-nonce'], 'scribe-keyword-suggestions' ) ) 
     260                $results = Scribe_Google::get_suggestions( $term ); 
     261 
     262            if ( empty( $results ) || ! is_array( $results ) ) 
    254263                $results = array(); 
    255             } 
    256              
     264         
    257265            $return = array(); 
    258             foreach($results as $result) 
    259                 $return[] = array( 'value' => $result['term'], 'label' => sprintf('%s', esc_js( $result['term'] ) ) ); 
    260              
    261             echo json_encode($return); 
     266            foreach( $results as $result ) 
     267                $return[] = array( 'value' => $result['term'], 'label' => esc_js( $result['term'] ) ); 
     268             
     269            echo json_encode( $return ); 
    262270            exit; 
    263271        } 
     
    277285                $results = array('error' => false, 'keyword' => $target_keyword, 'suggestions' => $suggestions, 'previous_suggestions' => $previous_suggestions, 'evaluations_remaining' => number_format_i18n(self::get_keyword_evaluations_remaining($account))); 
    278286            } else { 
    279                 $results = array('error' => true, 'error_message' => __('Invalid request.')); 
     287                $results = array('error' => true, 'error_message' => __('Invalid request.', 'scribeseo')); 
    280288            } 
    281289 
     
    322330        public static function ajax_handle_build_links() { 
    323331            $data = stripslashes_deep($_REQUEST); 
    324                          
     332 
    325333            if(isset($data['scribe-build-links-nonce']) && wp_verify_nonce($data['scribe-build-links-nonce'], 'scribe-build-links')) { 
    326334                $post_id = isset( $data['scribe-post-id'] ) ?  $data['scribe-post-id'] : 0; 
    327                 $type = strip_tags( stripslashes( $data['type'] ) ); 
     335                $type = strip_tags( $data['type'] ); 
    328336                $keywords = array_filter( $data['scribe-keywords'] ); 
    329337 
     
    340348                            $link_analysis->score = $analysis; 
    341349                            $link_analysis->linkScore = $analysis; 
    342                             $link_analysis->score_description = sprintf( scribe_get_link_building_score_description( $link_analysis->score ), implode( __( ' and ', 'scribeseo' ), $keywords ) ); 
     350                            $link_analysis->score_description = sprintf( esc_js( __( scribe_get_link_building_score_description( $link_analysis->score ) ) ), implode( esc_js( __( ' and ', 'scribeseo' ) ), $keywords ) ); 
    343351                            break; 
    344352                        case 'int': 
     
    364372                } 
    365373            } else { 
    366                 $results = array('error' => true, 'error_message' => __('Invalid request.')); 
     374                $results = array('error' => true, 'error_message' => esc_js( __( 'Invalid request.', 'scribeseo' ) ) ); 
    367375            } 
    368376 
     
    375383        public static function add_administrative_interface_items() { 
    376384            self::$admin_page_hooks[] = $connections = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __( 'Site Connections', 'scribeseo' ), __( 'Site Connections', 'scribeseo' ), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_CONNECTIONS, array(__CLASS__, 'display_connections_page')); 
    377             self::$admin_page_hooks[] = $account = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __('Account'), __('Account'), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_ACCOUNT, array(__CLASS__, 'display_account_page')); 
    378             self::$admin_page_hooks[] = $compatibility = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __('Compatibility'), __('Compatibility'), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_COMPATIBILITY, array(__CLASS__, 'display_compatibility_page')); 
    379             self::$admin_page_hooks[] = $news = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __('SEO News'), __('SEO News'), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_NEWS, array(__CLASS__, 'display_news_page')); 
    380             self::$admin_page_hooks[] = $support = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __( 'Scribe Help', 'scribeseo' ), __( 'Scribe Help', 'scribeseo' ), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_SUPPORT, array(__CLASS__, 'display_support_page')); 
    381              
    382             add_action("load-{$compatibility}", array(__CLASS__, 'process_compatibility_check')); 
    383             add_action("load-{$support}", array(__CLASS__, 'redirect_to_support')); 
    384              
     385            self::$admin_page_hooks[] = $account = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __('Account', 'scribeseo'), __('Account', 'scribeseo'), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_ACCOUNT, array(__CLASS__, 'display_account_page')); 
     386 
     387            if ( ! self::is_hosted() ) { 
     388 
     389                self::$admin_page_hooks[] = $compatibility = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __('Compatibility', 'scribeseo'), __('Compatibility', 'scribeseo'), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_COMPATIBILITY, array(__CLASS__, 'display_compatibility_page')); 
     390                add_action("load-{$compatibility}", array(__CLASS__, 'process_compatibility_check')); 
     391 
     392            } 
     393 
     394            self::$admin_page_hooks[] = $news = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __('SEO News', 'scribeseo'), __('SEO News', 'scribeseo'), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_NEWS, array(__CLASS__, 'display_news_page')); 
     395 
     396            if ( ! self::is_hosted() ) { 
     397 
     398                self::$admin_page_hooks[] = $support = add_submenu_page(self::SETTINGS_TOP_PAGE_SLUG, __( 'Scribe Help', 'scribeseo' ), __( 'Scribe Help', 'scribeseo' ), 'manage_options', self::SETTINGS_SUB_PAGE_SLUG_SUPPORT, array(__CLASS__, 'display_support_page')); 
     399                add_action("load-{$support}", array(__CLASS__, 'redirect_to_support')); 
     400 
     401            } 
    385402             
    386403            $settings = self::get_settings(); 
     
    402419         
    403420        public static function add_scribe_columns($columns) { 
    404             $columns['scribe-doc-score'] = __('Scribe Page Score'); 
    405             $columns['scribe-site-score'] = __('Scribe Site Score'); 
    406             $columns['scribe-keywords'] = __('Scribe Keywords'); 
     421            $columns['scribe-doc-score'] = __('Scribe Page Score', 'scribeseo'); 
     422            $columns['scribe-site-score'] = __('Scribe Site Score', 'scribeseo'); 
     423            $columns['scribe-keywords'] = __('Scribe Keywords', 'scribeseo'); 
    407424            if ( self::$scribe_has_v3_data ) 
    408425                $columns['scribe-v3'] = __('Scribe v3 Score', 'scribeseo' ); 
     
    436453                        break; 
    437454                    case 'scribe-keywords': 
    438                         echo __('Awaiting Analysis'); 
     455                        esc_html_e( 'Awaiting Analysis', 'scribeseo' ); 
    439456                        break; 
    440457                } 
     
    445462                case 'scribe-doc-score': 
    446463                    if ( empty( $content_analysis->docScore ) ) 
    447                         _e( 'N/A', 'scribeseo' ); 
     464                        esc_html_e( 'N/A', 'scribeseo' ); 
    448465                    else 
    449466                        printf( '<span class="%1$s">%2$s</span>', scribe_score_class( (int)$content_analysis->docScore ), (int)$content_analysis->docScore ); 
     
    452469                case 'scribe-site-score': 
    453470                    if ( empty( $content_analysis->scribeScore ) ) 
    454                         _e( 'N/A', 'scribeseo' ); 
     471                        esc_html_e( 'N/A', 'scribeseo' ); 
    455472                    else 
    456473                        printf( '<span class="%1$s">%2$s</span>', scribe_score_class( (int)$content_analysis->scribeScore, 'site' ), (int)$content_analysis->scribeScore ); 
     
    460477                    $keywords = self::get_content_analysis_keywords( $content_analysis, ' + ', false ); 
    461478                    if ( empty( $keywords ) ) 
    462                         _e( 'None', 'scribeseo' ); 
     479                        esc_html_e( 'None', 'scribeseo' ); 
    463480                    else 
    464481                        printf( '<span class="scribe-post-column-keywords">%s</span>', esc_html( $keywords ) ); 
     
    474491        } 
    475492         
    476         public static function add_upload_iframe_args($url) { 
    477             return add_query_arg(self::$upload_iframe_args, $url); 
     493        public static function add_upload_iframe_args( $url ) { 
     494            $args = array_map( 'urlencode', self::$upload_iframe_args ); 
     495            return add_query_arg( self::$upload_iframe_args, $url ); 
    478496        } 
    479497         
     
    502520 
    503521            $configuration = array( 
    504                 'content_analysis_label' => __('Content Analysis'), 
    505                 'keyword_research_label' => __('Keyword Research'), 
     522                'content_analysis_label' => __('Content Analysis', 'scribeseo'), 
     523                'keyword_research_label' => __('Keyword Research', 'scribeseo'), 
    506524             
    507525                'content_id' => apply_filters( 'scribeseo_post_content_id', 'content' ), 
     
    509527                'seo_description_id' => ! empty( $seo_tool_settings->description ) ? trim( $seo_tool_settings->description ) : '', 
    510528                 
    511                 'autocomplete_url' => add_query_arg(array('action' => 'scribe_keyword_suggestions'), admin_url('admin-ajax.php')), 
     529                'autocomplete_url' => add_query_arg( array( 'action' => 'scribe_keyword_suggestions', 'scribe-keyword-suggestions-nonce' => wp_create_nonce( 'scribe-keyword-suggestions' ) ), admin_url( 'admin-ajax.php' ) ), 
    512530            ); 
    513531            wp_localize_script('scribe-backend', 'Scribe_SEO_Configuration', $configuration); 
     
    519537            if ( isset( $_GET['scribe-dismiss-premise-nag'] ) && 1 == $_GET['scribe-dismiss-premise-nag'] ) { 
    520538                update_option(self::SHOW_PREMISE_NAG_KEY, 'no'); 
    521                 wp_redirect(add_query_arg(array('page' => self::SETTINGS_SUB_PAGE_SLUG_SETTINGS), admin_url('admin.php'))); 
     539                wp_redirect( add_query_arg( array( 'page' => urlencode( self::SETTINGS_SUB_PAGE_SLUG_SETTINGS ) ), admin_url( 'admin.php' ) ) ); 
    522540                exit; 
    523541            } 
     
    542560                 
    543561                if($send_successful) { 
    544                     add_settings_error('general', 'settings_updated', __('Your results were successfully sent to the Copyblogger support team.'), 'updated'); 
     562                    add_settings_error('general', 'settings_updated', __('Your results were successfully sent to the Copyblogger support team.', 'scribeseo'), 'updated'); 
    545563                } else { 
    546                     add_settings_error('general', 'settings_updated', __('There was an issue sending your report. Please copy the below information and email it directly to <a href="mailto:support@copyblogger.com">support@copyblogger.com</a>.'), 'error'); 
     564                    add_settings_error('general', 'settings_updated', sprintf( esc_html__('There was an issue sending your report. Please copy the below information and email it directly to %s.', 'scribeseo'), '<a href="mailto:support@copyblogger.com">support@copyblogger.com</a>' ), 'error'); 
    547565                } 
    548566                set_transient('settings_errors', get_settings_errors(), 30); 
    549567                 
    550                 $location = add_query_arg(array('page' => self::SETTINGS_SUB_PAGE_SLUG_COMPATIBILITY, 'settings-updated' => 'true'), admin_url('admin.php')); 
    551                 wp_redirect($location); 
     568                $location = add_query_arg( array( 'page' => urlencode( self::SETTINGS_SUB_PAGE_SLUG_COMPATIBILITY ), 'settings-updated' => 'true' ), admin_url( 'admin.php' ) ); 
     569                wp_redirect( $location ); 
    552570                 
    553571                exit; 
     
    562580        public static function return_analysis_tabs($tabs) { 
    563581            $tabs = array( 
    564                 'scribe-analysis-keywords' => __('Keyword Analysis'), 
    565                 'scribe-analysis-document' => __('Page Analysis'), 
    566                 'scribe-analysis-tags' => __('Tags'), 
    567                 'scribe-analysis-help' => __('Help'), 
     582                'scribe-analysis-keywords' => __('Keyword Analysis', 'scribeseo'), 
     583                'scribe-analysis-document' => __('Page Analysis', 'scribeseo'), 
     584                'scribe-analysis-tags' => __('Tags', 'scribeseo'), 
     585                'scribe-analysis-help' => __('Help', 'scribeseo'), 
    568586            ); 
    569587             
     
    573591        public static function return_keyword_tabs($tabs) { 
    574592            $tabs = array( 
    575                 'scribe-keyword-suggestions' => __('Suggestions') 
     593                'scribe-keyword-suggestions' => __('Suggestions', 'scribeseo') 
    576594            ); 
    577595             
    578596            if($_GET['tab'] == 'scribe-keyword-details') { 
    579                 $tabs['scribe-keyword-details'] = __('Details'); 
     597                $tabs['scribe-keyword-details'] = __('Details', 'scribeseo'); 
    580598            } 
    581599             
     
    641659            $account = self::get_account($settings['api-key']); 
    642660             
    643             add_meta_box('scribe-main-account', __('Account Information'), array(__CLASS__, 'display_account_meta_box'), 'scribe-account', 'normal'); 
     661            add_meta_box('scribe-main-account', __('Account Information', 'scribeseo'), array(__CLASS__, 'display_account_meta_box'), 'scribe-account', 'normal'); 
    644662             
    645663            include( SCRIBE_PLUGIN_DIR . 'views/backend/settings/account.php' ); 
     
    651669         
    652670        public static function display_compatibility_page() { 
    653             add_meta_box('scribe-information-compatibility', __('Your Information'), array(__CLASS__, 'display_compatibility_info_meta_box'), 'scribe-compatibility', 'normal'); 
    654             add_meta_box('scribe-results-compatibility', __('Your Install Details'), array(__CLASS__, 'display_compatibility_results_meta_box'), 'scribe-compatibility', 'normal'); 
     671            add_meta_box('scribe-information-compatibility', __('Your Information', 'scribeseo'), array(__CLASS__, 'display_compatibility_info_meta_box'), 'scribe-compatibility', 'normal'); 
     672            add_meta_box('scribe-results-compatibility', __('Your Install Details', 'scribeseo'), array(__CLASS__, 'display_compatibility_results_meta_box'), 'scribe-compatibility', 'normal'); 
    655673             
    656674            include( SCRIBE_PLUGIN_DIR . 'views/backend/settings/compatibility.php' ); 
     
    675693        } 
    676694         
    677         public static function display_settings_page() { 
    678             add_meta_box('scribe-main-settings', __('Scribe Settings'), array(__CLASS__, 'display_settings_meta_box'), 'scribe-settings', 'normal'); 
    679              
    680             $dismiss_nag_url = add_query_arg(array('page' => self::SETTINGS_SUB_PAGE_SLUG_SETTINGS, 'scribe-dismiss-premise-nag' => 1), admin_url('admin.php')); 
    681             $show_nag = 'no' != get_option(self::SHOW_PREMISE_NAG_KEY); 
    682              
    683             include( SCRIBE_PLUGIN_DIR . 'views/backend/settings/settings.php' ); 
    684         } 
    685          
    686         public static function display_settings_meta_box() { 
    687             $settings = self::get_settings(); 
    688             $dependencies = self::get_available_dependencies(); 
    689  
    690             include( SCRIBE_PLUGIN_DIR . 'views/backend/meta-boxes/settings.php' ); 
    691         } 
    692  
    693695        public static function get_query_domain() { 
    694696 
     
    713715             
    714716            $data = stripslashes_deep($_REQUEST); 
    715             $post_id = $data['post_id']; 
     717            $post_id = isset( $data['post_id'] ) ? (int)$data['post_id'] : 0; 
    716718             
    717719            if ( empty( $post_id ) ) { 
     
    726728                case 'scribe-analysis-document': 
    727729 
    728                     $serp_url = self::get_permalink( $_REQUEST['post_id'] ); 
     730                    $serp_url = self::get_permalink( $post_id ); 
    729731 
    730732                    include( SCRIBE_PLUGIN_DIR . 'views/backend/content-analysis/document-analysis.php' ); 
     
    818820 
    819821            $tab = $data['tab']; 
     822            $queried_keyword = ''; 
    820823            switch($tab) { 
    821824                case 'scribe-keyword-details': 
     
    833836                    if($previous) { 
    834837                        $keywords = self::get_archived_keyword_suggestions( $post_id, $user_id ); 
    835                         $title = __('Previous Keyword Suggestions'); 
     838                        $title = esc_html__('Previous Keyword Suggestions', 'scribeseo'); 
    836839                    } else { 
    837840                        $queried_keyword = urldecode($data['scribe-keyword']); 
    838841                        $keywords = self::get_keyword_suggestions( $queried_keyword, $post_id, $user_id ); 
    839842 
    840                         $title = sprintf( __( 'Keyword Suggestions for <em>%1$s</em>', 'scribeseo' ), esc_html( $queried_keyword ) ); 
     843                        $title = sprintf( esc_html__( 'Keyword Suggestions for %1$s', 'scribeseo' ), '<em>' . esc_html( $queried_keyword ) . '</em>' ); 
    841844                    } 
    842845 
     
    942945            switch($settings['seo-tool-settings']->meta_storage) { 
    943946                case 'flat': 
    944                     update_post_meta($post_id, $settings['seo-tool-settings']->{$property}, $value); 
     947                    update_post_meta($post_id, $settings['seo-tool-settings']->$property, $value); 
    945948                    break; 
    946949                case 'array': 
    947                     $components = explode('.', $settings['seo-tool-settings']->{$property}); 
     950                    $components = explode('.', $settings['seo-tool-settings']->$property); 
    948951                    $existing = get_post_meta($post_id, $settings['seo-tool-settings']->meta_storage_key, true); 
    949952                     
     
    11891192             
    11901193            $key = self::get_target_term_key($post_id); 
    1191               
     1194 
     1195            $target_term = strtolower( $target_term ); 
    11921196            update_user_option( $user_id, self::get_target_term_key( $post_id, false ), $target_term ); 
    11931197            wp_cache_set($key, $target_term, $user_id, time() + self::CACHE_PERIOD); 
     
    13771381        private static function get_content_recommendations($possessed_keys) { 
    13781382            $desired_keys = array( 
    1379                 'TitleLen' => __('The HTML title of the page contains less than three words, consider adding more words to the HTML title.'), 
    1380                 'TitleCharLen' => __('The HTML title of the page is too long, consider shortening the title to less than 72 characters.'), 
    1381                 'MetaCharLen' => __('The META DESCRIPTION is too long, consider shortening the description to less than 165 characters.'), 
    1382                 'BodyLen' => __('The page is too short, consider adding more words to the page.'), 
    1383                 'Hyper' => __('No hyperlinks were found in the page, consider adding hyperlinks to relevant terms.'), 
    1384                 'HyperLen' => __('No hyperlinks were found in the first part of the page, consider adding a hyperlink to the first paragraph.'), 
     1383                'TitleLen' => __('The HTML title of the page contains less than three words, consider adding more words to the HTML title.', 'scribeseo'), 
     1384                'TitleCharLen' => __('The HTML title of the page is too long, consider shortening the title to less than 72 characters.', 'scribeseo'), 
     1385                'MetaCharLen' => __('The META DESCRIPTION is too long, consider shortening the description to less than 165 characters.', 'scribeseo'), 
     1386                'BodyLen' => __('The page is too short, consider adding more words to the page.', 'scribeseo'), 
     1387                'Hyper' => __('No hyperlinks were found in the page, consider adding hyperlinks to relevant terms.', 'scribeseo'), 
     1388                'HyperLen' => __('No hyperlinks were found in the first part of the page, consider adding a hyperlink to the first paragraph.', 'scribeseo'), 
    13851389                'NoPKW' => __( 'No Primary Keywords were found in your content. See the information under Improve Keyword Rank to improve the identification of a keyword.', 'scribeseo' ), 
    13861390            ); 
     
    15371541 
    15381542            if ( ( empty( $links->googlePlusActivities ) && empty( $links->twitterProfiles ) ) || ( ! is_array( $links->googlePlusActivities ) && ! is_array( $links->twitterProfiles ) ) ) 
    1539                 return __( '<p>No Activity</p>', 'scribeseo' ); 
    1540  
    1541             $plus_format = '<li class="scribe-google-plus-item"><a href="http://plus.google.com/u/0/%1$s" title="%2$s" class="img" target="_blank"><img src="%3$s" /></a><h4><a href="http://plus.google.com/u/0/%1$s" title="%2$s" target="_blank">%2$s</a></h4> %4$s</li>'; 
    1542             $twitter_format = '<li class="scribe-google-plus-item"><a href="http://twitter.com/%1$s" class="img" target="_blank"><img src="%2$s" /></a><h4><a href="http://twitter.com/%1$s" target="_blank">%1$s</a> <span class="scribe-google-plus-klout-score">%4$d</span></h4> %3$s</li>'; 
     1543                return '<p>' . esc_html__( 'No Activity', 'scribeseo' ). '</p>'; 
     1544 
     1545            $plus_format = '<li class="scribe-google-plus-item"><a href="%1$s" title="%2$s" class="img" target="_blank"><img src="%3$s" /></a><h4><a href="%1$s" title="%2$s" target="_blank">%2$s</a></h4> %4$s</li>'; 
     1546            $twitter_format = '<li class="scribe-google-plus-item"><a href="%1$s" class="img" target="_blank"><img src="%2$s" /></a><h4><a href="%1$s" target="_blank">%1$s</a> <span class="scribe-google-plus-klout-score">%4$d</span></h4> %3$s</li>'; 
    15431547            $output = '<ul class="scribe-google-plus-items">'; 
    15441548 
    15451549            foreach( (array)$links->googlePlusActivities as $activity ) 
    1546                 $output .= sprintf( $plus_format, esc_url( $activity->profileId ), esc_attr( $activity->profileDisplayName ), esc_url( $activity->profileImageUrl ), esc_html( $activity->content ) ); 
     1550                $output .= sprintf( $plus_format, esc_url( 'http://plus.google.com/u/0/' . $activity->profileId ), esc_attr( $activity->profileDisplayName ), esc_url( $activity->profileImageUrl ), wp_kses( $activity->content, self::formatting_allowedtags() ) ); 
    15471551 
    15481552            foreach( (array)$links->twitterProfiles as $activity ) 
    1549                 $output .= sprintf( $twitter_format, esc_url( $activity->profileDisplayName ), esc_url( $activity->profileImageUrl ), esc_html( $activity->content ), $activity->klout ); 
     1553                $output .= sprintf( $twitter_format, esc_url( 'http://twitter.com/' . $activity->profileDisplayName ), esc_url( $activity->profileImageUrl ), wp_kses( $activity->content, self::formatting_allowedtags() ), $activity->klout ); 
    15501554 
    15511555            $output .= '</ul>'; 
     
    15641568 
    15651569            if ( is_wp_error( $comments ) ) 
    1566                 return '<p>' . $comments->get_error_message() . '</p>'; 
     1570                return '<p>' . esc_html( $comments->get_error_message() ) . '</p>'; 
    15671571 
    15681572            if ( empty( $comments->comments ) || ! is_array( $comments->comments ) ) 
    1569                 return '<p>' . __( 'No Activity', 'scribeseo' ) . '</p>'; 
    1570  
    1571             $plus_format = '<li class="scribe-google-plus-item"><a href="http://plus.google.com/u/0/%1$s" title="%2$s" class="img" target="_blank"><img src="%3$s" /></a><div class="scribe-google-plus-comment"><span class="scribe-google-plus-content">%4$s</span> <p>%5$s <span class="scribe-google-plus-author"><a href="http://plus.google.com/u/0/%1$s" title="%2$s" target="_blank">%2$s</a></span></p></div></li>'; 
     1573                return '<p>' . esc_html__( 'No Activity', 'scribeseo' ). '</p>'; 
     1574 
     1575            $plus_format = '<li class="scribe-google-plus-item"><a href="%1$s" title="%2$s" class="img" target="_blank"><img src="%3$s" /></a><div class="scribe-google-plus-comment"><span class="scribe-google-plus-content">%4$s</span> <p>%5$s <span class="scribe-google-plus-author"><a href="%1$s" title="%2$s" target="_blank">%2$s</a></span></p></div></li>'; 
    15721576            $output = '<ul class="scribe-google-plus-items">'; 
    15731577            foreach( (array)$comments->comments as $comment ) 
    1574                 $output .= sprintf( $plus_format, esc_url( $comment->profileId ), esc_attr( $comment->profileDisplayName ), esc_url( $comment->profileImageUrl ), esc_html( $comment->content ), __( 'Posted by', 'scribeseo' ) ); 
     1578                $output .= sprintf( $plus_format, esc_url( 'http://plus.google.com/u/0/' . $comment->profileId ), esc_attr( $comment->profileDisplayName ), esc_url( $comment->profileImageUrl ), wp_kses( $comment->content, self::formatting_allowedtags() ), esc_html__( 'Posted by', 'scribeseo' ) ); 
    15751579 
    15761580            $output .= '</ul>'; 
     
    15941598 
    15951599            if ( is_wp_error( $links ) ) 
    1596                 return '<p>' . $links->get_error_message() . '</p>'; 
     1600                return '<p>' . esc_html( $links->get_error_message() ) . '</p>'; 
    15971601 
    15981602            if ( empty( $links->twitterProfiles ) || ! is_array( $links->twitterProfiles ) ) 
    1599                 return '<p>' . __( 'No Activity', 'scribeseo' ) . '</p>'; 
     1603                return '<p>' . esc_html__( 'No Activity', 'scribeseo' ). '</p>'; 
    16001604 
    16011605            $twitter_format = '<li class="scribe-google-plus-item"><a href="http://twitter.com/%1$s" class="img" target="_blank"><img src="%2$s" /></a><h4><a href="http://twitter.com/%1$s" target="_blank">%2$s</a></h4> %3$s</li>'; 
     
    16311635             
    16321636            if(empty($name)) { 
    1633                 $name = __('Unknown User'); 
     1637                $name = __('Unknown User', 'scribeseo'); 
    16341638            } 
    16351639             
     
    16391643             
    16401644            if(!empty($issue)) { 
    1641                 $issue = sprintf(__("They also added the following comments:\n\n===\n\n%s\n\n==="), $issue); 
     1645                $issue = sprintf(__("They also added the following comments:\n\n===\n\n%s\n\n===", 'scribeseo'), $issue); 
    16421646            } 
    16431647             
    16441648            $site_name = get_bloginfo('name'); 
    16451649            $site_domain = home_url('/'); 
    1646             $email_subject = sprintf(__('Scribe Compatibility Check from %1$s at %2$s'), $name, $site_name); 
     1650            $email_subject = sprintf(__('Scribe Compatibility Check from %1$s at %2$s', 'scribeseo'), $name, $site_name); 
    16471651 
    16481652            $test_results = self::get_test_results(); 
     
    16621666 
    16631667Regards, 
    1664 Scribe SEO Plugin'), $site_name, $site_domain, $name, $email, $issue, $test_results_text); 
     1668Scribe SEO Plugin', 'scribeseo'), $site_name, $site_domain, $name, $email, $issue, $test_results_text); 
    16651669 
    16661670            $email_to = 'support@copyblogger.com'; 
     
    17071711            global $wpdb; 
    17081712 
    1709             $key = $wpdb->get_blog_prefix() . substr( self::PREVIOUS_KEYWORD_SUGGESTIONS_KEY, 0, -1 ) . '\_%'; 
    1710             $cached_ids = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM {$wpdb->usermeta} WHERE meta_key LIKE %s", $key ) ); 
     1713            $blog_users = get_users(); 
     1714            $ids = array(); 
     1715            foreach( $blog_users as $user ) 
     1716                $ids[] = $user->ID; 
     1717 
     1718            $meta_query = $wpdb->prepare( "SELECT user_id, meta_key FROM {$wpdb->usermeta} WHERE  user_id IN (" . implode( ',', $ids ) . ') AND meta_key LIKE %s', $wpdb->get_blog_prefix() . self::PREVIOUS_KEYWORD_SUGGESTIONS_KEY . '%' ); 
     1719            $cached_ids = $wpdb->get_results( $meta_query ); 
    17111720 
    17121721            if ( empty( $cached_ids ) ) 
    17131722                return; 
    17141723 
    1715             foreach( $cached_ids as $id ) 
    1716                 $wpdb->delete( $wpdb->usermeta, array( 'umeta_id' => $id ), array( '%d' ) ); 
     1724            $prefix_length = strlen( $wpdb->get_blog_prefix() ); 
     1725            foreach( $cached_ids as $row ) 
     1726                delete_user_option( $row->user_id, substr( $row->meta_key, $prefix_length ) ); 
    17171727 
    17181728        } 
     
    19221932        } 
    19231933 
     1934        function is_hosted() { 
     1935 
     1936            return defined( 'SCRIBE_IS_HOSTED' ) && SCRIBE_IS_HOSTED; 
     1937 
     1938        } 
    19241939    } 
    19251940     
  • scribe/trunk/views/backend/content-analysis/document-analysis.php

    r614019 r642313  
    11<div class="scribe-wrap"> 
    22    <div class="scribe-document-analysis-search-result-previews-container"> 
    3         <h3><?php _e('Page Analysis Metric'); ?></h3> 
     3        <h3><?php esc_html_e('Page Analysis Metric', 'scribeseo'); ?></h3> 
    44        <div class="scribe-document-analysis-keyword-analysis-metric-outer scribe-popup-analysis-score-wrap"> 
    55            <div class="scribe-wrap scribe-content-analysis-score scribe-analysis-meta-box-score" style="float: left; width: 40%"> 
    6                 <?php _e( 'Page Score: ', 'scribeseo' ); ?> 
     6                <?php esc_html_e( 'Page Score: ', 'scribeseo' ); ?> 
    77                <span class="<?php echo scribe_score_class( $content_analysis->docScore ); ?>"> 
    88                <?php 
    99                if ( empty( $content_analysis ) ) { 
    10                      _e( '-', 'scribeseo' ); 
     10                     esc_html_e( '-', 'scribeseo' ); 
    1111                } elseif ( isset( $content_analysis->docScore ) ) { 
    1212                    printf( '%d', $content_analysis->docScore ); 
    1313                } else { 
    14                     _e( 'N/A', 'scribeseo' ); 
     14                    esc_html_e( 'N/A', 'scribeseo' ); 
    1515                } 
    1616                ?> 
     
    2323 
    2424    <div class="scribe-document-analysis-improve-document-structure"> 
    25         <h3><?php _e('Improve Page Structure'); ?></h3> 
    26         <p><?php _e('To improve the overall structure of your page, review the recommendations below.'); ?></p> 
     25        <h3><?php esc_html_e('Improve Page Structure', 'scribeseo'); ?></h3> 
     26        <p><?php esc_html_e('To improve the overall structure of your page, review the recommendations below.', 'scribeseo'); ?></p> 
    2727 
    2828        <table class="widefat scribe-document-analysis-improve-document-structure-table"> 
    2929            <thead> 
    3030                <tr valign="top"> 
    31                     <th scope="col"><?php _e('Analysis &amp; Recommendations'); ?></th> 
     31                    <th scope="col"><?php esc_html_e('Analysis &amp; Recommendations', 'scribeseo'); ?></th> 
    3232                </tr> 
    3333            </thead> 
     
    3838                        <ul <?php echo empty( $recommendations ) ? 'class="scribe-ready"' : ''; ?> style="margin: 0;"> 
    3939                        <?php if(empty($recommendations)) { ?> 
    40                             <li><span><?php _e('Good job! There are no recommendations for your content.'); ?></span></li> 
     40                            <li><span><?php esc_html_e('Good job! There are no recommendations for your content.', 'scribeseo'); ?></span></li> 
    4141                        <?php 
    4242                        } else { 
     
    4949                        ?> 
    5050                            <li><span> 
    51                                 <strong><?php _e('Flesch Score'); ?></strong> 
    52                                 <?php printf(__('The Flesch Score describes comprehension difficulty for a passage of text.<br />The Flesch score for this page is: <strong>%s</strong>'), esc_html( ucwords( $content_analysis->fleschScore ) ) ); ?> 
     51                                <strong><?php esc_html_e('Flesch Score', 'scribeseo'); ?></strong> 
     52                                <?php printf( esc_html__( 'The Flesch Score describes comprehension difficulty for a passage of text.<br />The Flesch score for this page is: %s', 'scribeseo'), '<strong>' . esc_html( ucwords( $content_analysis->fleschScore ) ) . '</strong>' ); ?> 
    5353                            </span></li> 
    5454                        </ul> 
     
    5959    </div> 
    6060    <div class="scribe-document-analysis-search-result-previews-container"> 
    61         <h3><?php _e( 'Search Engine Example', 'scribseo' ); ?></h3> 
    62         <p><?php _e('The following is an example of  how the content may appear in a Bing or Google search result.  You may make changes to this by editing the Title Tag and Meta Description.'); ?></p> 
     61        <h3><?php esc_html_e( 'Search Engine Example', 'scribseo' , 'scribeseo'); ?></h3> 
     62        <p><?php esc_html_e('The following is an example of  how the content may appear in a Bing or Google search result.  You may make changes to this by editing the Title Tag and Meta Description.', 'scribeseo'); ?></p> 
    6363 
    6464        <?php 
     
    7373                     
    7474                    <p class="scribe-document-analysis-search-result-preview-url"><?php echo esc_html( $serp_url ? $serp_url : $content_analysis->serp_url ); ?></p> 
    75                     <p><?php echo esc_html($content_analysis->serp_description); ?></p> 
     75                    <p><?php echo esc_html( $content_analysis->serp_description ); ?></p> 
    7676                     
    7777                </div> 
     
    8383     
    8484    <div class="scribe-document-analysis-improve-keyword-grades"> 
    85         <h3><?php _e('Improve Keyword Rank'); ?></h3> 
    86         <p><?php _e('To improve the ranking of your keywords, review the recommendations below.'); ?></p> 
     85        <h3><?php esc_html_e('Improve Keyword Rank', 'scribeseo'); ?></h3> 
     86        <p><?php esc_html_e('To improve the ranking of your keywords, review the recommendations below.', 'scribeseo'); ?></p> 
    8787         
    8888        <table class="widefat scribe-document-analysis-improve-keyword-grades-table"> 
    8989            <thead> 
    9090                <tr valign="top"> 
    91                     <th scope="col" class="scribe-document-analysis-improve-keyword-grades-table-keyword"><?php _e('Keyword'); ?></th> 
    92                     <th scope="col" class="scribe-document-analysis-improve-keyword-grades-table-recommendations"><?php _e('Analysis &amp; Recommendations'); ?></th> 
     91                    <th scope="col" class="scribe-document-analysis-improve-keyword-grades-table-keyword"><?php esc_html_e('Keyword', 'scribeseo'); ?></th> 
     92                    <th scope="col" class="scribe-document-analysis-improve-keyword-grades-table-recommendations"><?php esc_html_e('Analysis & Recommendations', 'scribeseo'); ?></th> 
    9393                </tr> 
    9494            </thead> 
    9595            <tbody> 
    96                 <?php foreach($content_analysis->keywords as $keyword) { $keyword_recommendations = self::get_keyword_recommendations($keyword->kwe, $keyword->text); if(empty($keyword_recommendations)) { continue; } ?> 
     96                <?php  
     97                foreach( $content_analysis->keywords as $keyword ) { 
     98                    $keyword_recommendations = self::get_keyword_recommendations( $keyword->kwe, $keyword->text ); 
     99                    if ( empty( $keyword_recommendations ) ) 
     100                        continue;  
     101                ?> 
    97102                <tr valign="top"> 
    98103                    <td scope="row" class="scribe-document-analysis-improve-keyword-grades-table-keyword"><?php echo esc_html( ucwords( $keyword->text ) ); ?></td> 
     
    100105                        <ul style="margin: 0;"> 
    101106                            <?php foreach($keyword_recommendations as $recommendation) { ?> 
    102                             <li><span><?php esc_html_e($recommendation); ?></span></li> 
     107                            <li><span><?php echo esc_html( $recommendation ); ?></span></li> 
    103108                            <?php } ?> 
    104109                        </ul> 
  • scribe/trunk/views/backend/content-analysis/keyword-analysis.php

    r614019 r642313  
    22     
    33    <div class="scribe-keyword-analysis-metrics"> 
    4         <h3><?php _e('Keyword Analysis Metric'); ?></h3> 
     4        <h3><?php esc_html_e('Keyword Analysis Metric', 'scribeseo'); ?></h3> 
    55        <div class="scribe-document-analysis-keyword-analysis-metric-outer scribe-popup-analysis-score-wrap"> 
    66            <div class="scribe-wrap scribe-content-analysis-score scribe-analysis-meta-box-score" style="float: left; width: 30%"> 
    7                 <?php _e( 'Site Score: ', 'scribeseo' ); ?> 
     7                <?php esc_html_e( 'Site Score: ', 'scribeseo' ); ?> 
    88                <span class="<?php echo scribe_score_class( $content_analysis->scribeScore, 'site' ); ?>"> 
    99                <?php 
    1010                if ( empty( $content_analysis ) ) { 
    11                      _e( '-', 'scribeseo' ); 
     11                     esc_html_e( '-', 'scribeseo' ); 
    1212                } elseif ( isset( $content_analysis->scribeScore ) ) { 
    1313                    printf( '%d', $content_analysis->scribeScore ); 
    1414                } else { 
    15                     _e( 'N/A', 'scribeseo' ); 
     15                    esc_html_e( 'N/A', 'scribeseo' ); 
    1616                } 
    1717                ?> 
    1818                </span> 
    1919            </div> 
    20             <span class="scribe-wrap" style="float: left; width: 55%"><?php echo scribe_get_content_analyis_site_score_text( $content_analysis->scribeScore, $content_analysis->keywords ); ?></span> 
     20            <span class="scribe-wrap" style="float: left; width: 55%"><?php echo wp_kses( scribe_get_content_analyis_site_score_text( $content_analysis->scribeScore, $content_analysis->keywords ), Scribe_SEO::formatting_allowedtags() ); ?></span> 
    2121            <div class="clear"></div> 
    2222        </div> 
    23         <p><?php printf(__('Keyword Analysis inspects your page to compare the use of keywords against two metric - the usage of the keyword on your site (Search Metric) and recommended copywriting styles (Copy Styles). The stronger these two metrics, the better your score. To improve the score for a keyword, go to <a href="%1$s">Content Optimizer</a> for more details.'), add_query_arg(array('type' => 'scribe-analysis-keywords', 'tab' => 'scribe-analysis-document'))); ?></p> 
     23        <p><?php printf( esc_html__('Keyword Analysis inspects your page to compare the use of keywords against two metric - the usage of the keyword on your site (Search Metric) and recommended copywriting styles (Copy Styles). The stronger these two metrics, the better your score. To improve the score for a keyword, go to %1$s for more details.', 'scribeseo'), '<a href="' . add_query_arg( array( 'type' => 'scribe-analysis-keywords', 'tab' => 'scribe-analysis-document' ) ) . '">' . esc_html__( 'Content Optimizer', 'scribeseo' ) . '</a>' ); ?></p> 
    2424 
    2525        <div> 
     
    5454     
    5555    <div class="scribe-keyword-analysis-details"> 
    56         <h3><?php _e('Keyword Details'); ?></h3> 
    57         <p><?php _e('A comprehensive assessment of every keyword found within the content.'); ?></p> 
     56        <h3><?php esc_html_e( 'Keyword Details', 'scribeseo' ); ?></h3> 
     57        <p><?php esc_html_e( 'A comprehensive assessment of every keyword found within the content.', 'scribeseo' ); ?></p> 
    5858     
    5959        <table class="widefat scribe-keyword-analysis-details-table"> 
    6060            <thead> 
    6161                <tr valign="top"> 
    62                     <th scope="col" class="scribe-keyword-analysis-details-table-keyword"><?php _e('Keyword'); ?></th> 
    63                     <th scope="col" class="scribe-keyword-analysis-details-table-score"><?php _e('Grade'); ?></th> 
    64                     <th scope="col" class="scribe-keyword-analysis-details-table-rank"><?php _e('Rank'); ?></th> 
    65                     <th scope="col" class="scribe-keyword-analysis-details-table-prominence"><?php _e('Prominence'); ?></th> 
    66                     <th scope="col" class="scribe-keyword-analysis-details-table-frequency"><?php _e('Frequency'); ?></th> 
    67                     <th scope="col" class="scribe-keyword-analysis-details-table-density"><?php _e('Density'); ?></th> 
     62                    <th scope="col" class="scribe-keyword-analysis-details-table-keyword"><?php esc_html_e('Keyword', 'scribeseo'); ?></th> 
     63                    <th scope="col" class="scribe-keyword-analysis-details-table-score"><?php esc_html_e('Grade', 'scribeseo'); ?></th> 
     64                    <th scope="col" class="scribe-keyword-analysis-details-table-rank"><?php esc_html_e('Rank', 'scribeseo'); ?></th> 
     65                    <th scope="col" class="scribe-keyword-analysis-details-table-prominence"><?php esc_html_e('Prominence', 'scribeseo'); ?></th> 
     66                    <th scope="col" class="scribe-keyword-analysis-details-table-frequency"><?php esc_html_e('Frequency', 'scribeseo'); ?></th> 
     67                    <th scope="col" class="scribe-keyword-analysis-details-table-density"><?php esc_html_e('Density', 'scribeseo'); ?></th> 
    6868                </tr> 
    6969            </thead> 
    7070            <tfoot> 
    7171                <tr valign="top"> 
    72                     <th scope="col" class="scribe-keyword-analysis-details-table-keyword"><?php _e('Keyword'); ?></th> 
    73                     <th scope="col" class="scribe-keyword-analysis-details-table-score"><?php _e('Grade'); ?></th> 
    74                     <th scope="col" class="scribe-keyword-analysis-details-table-rank"><?php _e('Rank'); ?></th> 
    75                     <th scope="col" class="scribe-keyword-analysis-details-table-prominence"><?php _e('Prominence'); ?></th> 
    76                     <th scope="col" class="scribe-keyword-analysis-details-table-frequency"><?php _e('Frequency'); ?></th> 
    77                     <th scope="col" class="scribe-keyword-analysis-details-table-density"><?php _e('Density'); ?></th> 
     72                    <th scope="col" class="scribe-keyword-analysis-details-table-keyword"><?php esc_html_e('Keyword', 'scribeseo'); ?></th> 
     73                    <th scope="col" class="scribe-keyword-analysis-details-table-score"><?php esc_html_e('Grade', 'scribeseo'); ?></th> 
     74                    <th scope="col" class="scribe-keyword-analysis-details-table-rank"><?php esc_html_e('Rank', 'scribeseo'); ?></th> 
     75                    <th scope="col" class="scribe-keyword-analysis-details-table-prominence"><?php esc_html_e('Prominence', 'scribeseo'); ?></th> 
     76                    <th scope="col" class="scribe-keyword-analysis-details-table-frequency"><?php esc_html_e('Frequency', 'scribeseo'); ?></th> 
     77                    <th scope="col" class="scribe-keyword-analysis-details-table-density"><?php esc_html_e('Density', 'scribeseo'); ?></th> 
    7878                </tr> 
    7979            </tfoot> 
     
    8888                    <td class="scribe-keyword-analysis-details-table-prominence"><?php echo esc_html( $keyword->kwp ); ?></td> 
    8989                    <td class="scribe-keyword-analysis-details-table-frequency"><?php echo esc_html( $keyword->kwf ); ?></td> 
    90                     <td class="scribe-keyword-analysis-details-table-density"><?php printf( __( '%.2f%%', 'scribeseo' ), $keyword->kwd ); ?></td> 
     90                    <td class="scribe-keyword-analysis-details-table-density"><?php printf( esc_html__( '%.2f%%', 'scribeseo' ), $keyword->kwd ); ?></td> 
    9191                </tr> 
    9292                <?php } ?> 
  • scribe/trunk/views/backend/content-analysis/tags.php

    r614019 r642313  
    11<div class="scribe-wrap"> 
    2     <div id="scribe-tags-added-message" class="updated"><p><?php _e( 'The tags you have selected will be added when you save this post.', 'scribeseo' ); ?></p></div> 
     2    <div id="scribe-tags-added-message" class="updated"><p><?php esc_html_e( 'The tags you have selected will be added when you save this post.', 'scribeseo' ); ?></p></div> 
    33    <form method="post" action="<?php echo add_query_arg( array() ); ?>"> 
    4         <p><?php _e('Consider adding the following semantically relevant terms to your Post Tags.'); ?></p> 
     4        <p><?php esc_html_e('Consider adding the following semantically relevant terms to your Post Tags.', 'scribeseo'); ?></p> 
    55        <ul> 
    66            <?php if(empty($content_analysis->tags)) { ?> 
    7                 <li><?php _e('No tags were found during the content analysis.'); ?></li> 
     7                <li><?php esc_html_e('No tags were found during the content analysis.', 'scribeseo'); ?></li> 
    88            <?php } else { ?> 
    99                <?php foreach( $tags as $tag => $checked ) { ?> 
     
    1818        </ul> 
    1919        <p class="submit"> 
    20             <input class="button button-primary" type="submit" name="scribe-add-post-tags" id="scribe-add-post-tags" value="<?php _e('Add to Post Tags'); ?>" /> 
     20            <input class="button button-primary" type="submit" name="scribe-add-post-tags" id="scribe-add-post-tags" value="<?php esc_html_e('Add to Post Tags', 'scribeseo'); ?>" /> 
    2121        </p> 
    2222    </form> 
  • scribe/trunk/views/backend/keyword-research/details.php

    r614019 r642313  
    33    <?php if ( is_wp_error( $details ) ) { ?> 
    44     
    5     <p><?php echo $details->get_error_message(); ?></p> 
     5    <p><?php echo esc_html( $details->get_error_message() ); ?></p> 
    66     
    77    <?php } else { ?> 
    88     
    99    <?php if ( $details->cached && $_GET['scribe-details-previous'] ) { ?> 
    10     <div class="scribe-keyword-details-old-warning"><?php _e( 'This information is historical and may not be currently accurate.', 'scribeseo' ); ?></div> 
     10    <div class="scribe-keyword-details-old-warning"><?php esc_html_e( 'This information is historical and may not be currently accurate.', 'scribeseo' ); ?></div> 
    1111    <?php } ?> 
    1212     
     
    1717            </div> 
    1818            <div class="scribe-keyword-details-overall-score-others"> 
    19                 <h3 class="scribe-keyword-details-overall-score-header"><?php printf( __( 'Overall Score for: <span class="scribe-keyword-details-overall-score-header-term">%s</span>', 'scribeseo' ), esc_html( $queried_keyword ) ); ?></h3> 
     19                <h3 class="scribe-keyword-details-overall-score-header"><?php printf( esc_html__( 'Overall Score for: %s', 'scribeseo' ), '<span class="scribe-keyword-details-overall-score-header-term">' . esc_html( $queried_keyword ) . '</span>' ); ?></h3> 
    2020                <p><?php scribe_the_overall_score_description( $details->scoreDifficulty ); ?></p> 
    2121            </div> 
     
    2727    <div class="scribe-keyword-details-analysis scribe-keyword-details-section"> 
    2828        <div class="scribe-keyword-details-graph-container"> 
    29             <h4><?php _e('Content Score'); ?></h4> 
     29            <h4><?php esc_html_e('Content Score', 'scribeseo'); ?></h4> 
    3030            <div class="scribe-keyword-details-graph-symbol scribe-keyword-details-graph-symbol-cross"></div> 
    3131            <div class="scribe-keyword-details-graph-outer"> 
     
    3636                </div> 
    3737            </div> 
    38             <p class="scribe-keyword-details-graph-description"><?php scribe_the_content_score_description( $details->scoreContent ); ?> <?php printf( __( '<a data-placement="%s" rel="popover" title="Tell Me More" data-content="The Content Score compares the amount of content on your site for the term versus the amount of content for sites that rank for the term. A score of 100 indicates that your site content is on par with those ranking sites." href="%1$s">Tell me more &raquo;</a>', 'scribeseo' ), 'right', scribe_get_content_score_more_link( $details->scoreContent ) ); ?></p> 
     38            <p class="scribe-keyword-details-graph-description"><?php scribe_the_content_score_description( $details->scoreContent ); ?> <?php printf( '<a data-placement="%s" rel="popover" title="%4$s" data-content="%2$s" href="%3$s">%4$s &raquo;</a>', 'right', esc_html__( 'The Content Score compares the amount of content on your site for the term versus the amount of content for sites that rank for the term. A score of 100 indicates that your site content is on par with those ranking sites.', 'scribeseo' ), scribe_get_content_score_more_link( $details->scoreContent ), esc_html__( 'Tell me more', 'scribeseo' ) ); ?></p> 
    3939        </div> 
    4040         
    4141        <div class="scribe-keyword-details-graph-container alt"> 
    42             <h4><?php _e('Link Score'); ?></h4> 
     42            <h4><?php esc_html_e('Link Score', 'scribeseo'); ?></h4> 
    4343            <div class="scribe-keyword-details-graph-symbol scribe-keyword-details-graph-symbol-check"></div> 
    4444            <div class="scribe-keyword-details-graph-outer"> 
     
    4949                </div> 
    5050            </div> 
    51             <p class="scribe-keyword-details-graph-description"><?php scribe_the_link_score_description( $details->scoreLinks ); ?> <?php printf( __( '<a data-placement="%s" rel="popover" title="Tell Me More" data-content="The Link Score compares the amount of links to your site to sites that are ranking for the selected term. A Link Score above 100 indicates that you are equal to or greater than the average number of sites that are ranking for the term." href="%1$s">Tell me more &raquo;</a>'), 'left', scribe_get_link_score_more_link( $details->scoreLinks ) ); ?></p> 
     51            <p class="scribe-keyword-details-graph-description"><?php scribe_the_link_score_description( $details->scoreLinks ); ?> <?php printf( '<a data-placement="%s" rel="popover" title="%4$s" data-content="%2$s" href="%3$s">%4$s &raquo;</a>', 'left', esc_html__( 'The Link Score compares the amount of links to your site to sites that are ranking for the selected term. A Link Score above 100 indicates that you are equal to or greater than the average number of sites that are ranking for the term.', 'scribeseo' ), scribe_get_link_score_more_link( $details->scoreLinks ), esc_html__( 'Tell me more', 'scribeseo' ) ); ?></p> 
    5252        </div> 
    5353         
    5454        <div class="scribe-keyword-details-graph-container"> 
    55             <h4><?php _e('Page Authority'); ?></h4> 
     55            <h4><?php esc_html_e('Page Authority', 'scribeseo'); ?></h4> 
    5656            <div class="scribe-keyword-details-graph-symbol scribe-keyword-details-graph-symbol-warn"></div> 
    5757            <div class="scribe-keyword-details-graph-outer"> 
     
    6262                </div> 
    6363            </div> 
    64             <p class="scribe-keyword-details-graph-description"><?php scribe_the_domain_authority_score_description( $details->scoreDomainAuthority ); ?> <?php printf( __( '<a data-placement="%s" rel="popover" title="Tell Me More" data-content="The authority of your site, as reported by SEOMoz, is compared to the average page authority of sites that are ranking for the term. A score of 100 or greater indicates that you are on par with the average authority of sites that are ranking." href="%1$s">Tell me more &raquo;</a>', 'scribeseo' ), 'right', scribe_get_domain_authority_score_more_link( $details->scoreDomainAuthority ) ); ?></p> 
     64            <p class="scribe-keyword-details-graph-description"><?php scribe_the_domain_authority_score_description( $details->scoreDomainAuthority ); ?> <?php printf( '<a data-placement="%s" rel="popover" title="%4$s" data-content="%2$s" href="%3$s">%4$s &raquo;</a>', 'right', esc_html__( 'The authority of your site, as reported by SEOMoz, is compared to the average page authority of sites that are ranking for the term. A score of 100 or greater indicates that you are on par with the average authority of sites that are ranking.', 'scribeseo' ), scribe_get_domain_authority_score_more_link( $details->scoreDomainAuthority ), esc_html__( 'Tell me more', 'scribeseo' ) ); ?></p> 
    6565        </div> 
    6666         
    6767        <div class="scribe-keyword-details-graph-container alt"> 
    68             <h4><?php _e('Social Media Shares'); ?></h4> 
     68            <h4><?php esc_html_e('Social Media Shares', 'scribeseo'); ?></h4> 
    6969            <div class="scribe-keyword-details-graph-symbol scribe-keyword-details-graph-symbol-check"></div> 
    7070            <div class="scribe-keyword-details-graph-outer"> 
     
    7575                </div> 
    7676            </div> 
    77             <p class="scribe-keyword-details-graph-description"><?php scribe_the_facebook_likes_score_description( $details->scoreFacebookLikes ); ?> <?php printf( __( '<a data-placement="%s" rel="popover" title="Tell Me More" data-content="For the this term, we compare the number of shares of your content on social media sites to the average sharing by sites that rank for the term. The higher this score, the better." href="%1$s">Tell me more &raquo;</a>', 'scribeseo' ), 'left', scribe_get_facebook_likes_score_more_link( $details->scoreFacebookLikes ) ); ?></p> 
     77            <p class="scribe-keyword-details-graph-description"><?php scribe_the_facebook_likes_score_description( $details->scoreFacebookLikes ); ?> <?php printf( '<a data-placement="%s" rel="popover" title="%4$s" data-content="%2$s" href="%3$s">%4$s &raquo;</a>', 'left', esc_html__( 'For the this term, we compare the number of shares of your content on social media sites to the average sharing by sites that rank for the term. The higher this score, the better.', 'scribeseo' ), scribe_get_facebook_likes_score_more_link( $details->scoreFacebookLikes ), esc_html__( 'Tell me more', 'scribeseo' ) ); ?></p> 
    7878        </div> 
    7979         
     
    8484        <div class="scribe-keyword-details-analysis-box-outer"> 
    8585            <div class="scribe-keyword-details-analysis-box"> 
    86                 <h3 class="scribe-keyword-details-analysis-box-title"><?php _e('Gender'); ?></h3> 
     86                <h3 class="scribe-keyword-details-analysis-box-title"><?php esc_html_e('Gender', 'scribeseo'); ?></h3> 
    8787                <ul> 
    88                     <li><strong><?php printf( '%.0f', $details->scoreGenderMale ); ?>%</strong> Male</li> 
    89                     <li><strong><?php printf( '%.0f', $details->scoreGenderFemale ); ?>%</strong> Female</li> 
     88                    <li><strong><?php printf( '%.0f', $details->scoreGenderMale ); ?>%</strong> <?php esc_html_e( 'Male', 'scribeseo' ); ?></li> 
     89                    <li><strong><?php printf( '%.0f', $details->scoreGenderFemale ); ?>%</strong> <?php esc_html_e( 'Female', 'scribeseo' ); ?></li> 
    9090                </ul> 
    9191            </div> 
     
    9494        <div class="scribe-keyword-details-analysis-box-outer"> 
    9595            <div class="scribe-keyword-details-analysis-box"> 
    96                 <h3 class="scribe-keyword-details-analysis-box-title"><?php _e('Age'); ?></h3> 
     96                <h3 class="scribe-keyword-details-analysis-box-title"><?php esc_html_e('Age', 'scribeseo'); ?></h3> 
    9797                <ul> 
    9898                    <li><strong><?php printf( '%.0f', $details->agePrimaryValue ); ?>%</strong> <?php echo esc_html( $details->agePrimaryDescription ); ?></li> 
     
    104104        <div class="scribe-keyword-details-analysis-box-outer"> 
    105105            <div class="scribe-keyword-details-analysis-box"> 
    106                 <h3 class="scribe-keyword-details-analysis-box-title"><?php _e( 'Avg. $ PPC', 'scribeseo' ); ?></h3> 
     106                <h3 class="scribe-keyword-details-analysis-box-title"><?php esc_html_e( 'Avg. $ PPC', 'scribeseo' ); ?></h3> 
    107107                <ul> 
    108108                    <li><strong>$<?php printf( '%.2f', $details->ppc ); ?></strong> Bing</li> 
     
    114114        <div class="scribe-keyword-details-analysis-box-outer last"> 
    115115            <div class="scribe-keyword-details-analysis-box last"> 
    116                 <h3 class="scribe-keyword-details-analysis-box-title"><?php _e( 'Search Volume'); ?></h3> 
     116                <h3 class="scribe-keyword-details-analysis-box-title"><?php esc_html_e( 'Search Volume', 'scribeseo'); ?></h3> 
    117117                <ul> 
    118                     <li><strong><?php echo number_format_i18n( $details->volumeAnnual ); ?></strong> <?php _e( 'Annual', 'scribeseo' ); ?></li> 
    119                     <li><strong><?php echo number_format_i18n( $details->volumeMonthly ); ?></strong> <?php _e( 'Monthly', 'scribeseo' ); ?></li> 
     118                    <li><strong><?php echo number_format_i18n( $details->volumeAnnual ); ?></strong> <?php esc_html_e( 'Annual', 'scribeseo' ); ?></li> 
     119                    <li><strong><?php echo number_format_i18n( $details->volumeMonthly ); ?></strong> <?php esc_html_e( 'Monthly', 'scribeseo' ); ?></li> 
    120120                </ul> 
    121121            </div> 
  • scribe/trunk/views/backend/keyword-research/suggestions.php

    r614019 r642313  
    11<div class="scribe-wrap"> 
    22    <?php if(is_wp_error($keywords)) { ?> 
    3     <p><?php _e('An error ocurred when retrieving keyword suggestions for the term you entered. Please <a class="scribe-thickbox-close" href="#">close this pop up</a> and try again.'); ?></p> 
     3    <p><?php printf( esc_html__('An error ocurred when retrieving keyword suggestions for the term you entered. Please %s and try again.', 'scribeseo'), '<a class="scribe-thickbox-close" href="#">' . esc_html__( 'close this pop up', 'scribeseo' ) . '</a>' ); ?></p> 
    44    <?php } else { ?> 
    55     
    66    <div class="scribe-link-building-tabs" data-link-building-complete="true"> 
    77        <h3 class="nav-tab-wrapper scribe-link-building-tabs-identifiers"> 
    8             <a class="nav-tab nav-tab-active" href="#scribe-keyword-research-suggestions" id="scribe-keyword-research-suggestions-tab-identifier"><?php _e('Keyword Suggestions'); ?></a> 
    9             <a class="nav-tab" href="#scribe-keyword-research-twitter" id="scribe-keyword-research-twitter-tab-identifier"><?php _e('Twitter'); ?></a> 
    10             <a class="nav-tab" href="#scribe-keyword-research-google-plus" id="scribe-keyword-research-google-plus-tab-identifier"><?php _e('Google+'); ?></a> 
    11             <a class="nav-tab" href="#scribe-keyword-research-google-insights" id="scribe-keyword-research-google-insights-tab-identifier"><?php _e('Google Trends'); ?></a> 
     8            <a class="nav-tab nav-tab-active" href="#scribe-keyword-research-suggestions" id="scribe-keyword-research-suggestions-tab-identifier"><?php esc_html_e('Keyword Suggestions', 'scribeseo'); ?></a> 
     9            <a class="nav-tab" href="#scribe-keyword-research-twitter" id="scribe-keyword-research-twitter-tab-identifier"><?php esc_html_e('Twitter', 'scribeseo'); ?></a> 
     10            <a class="nav-tab" href="#scribe-keyword-research-google-plus" id="scribe-keyword-research-google-plus-tab-identifier"><?php esc_html_e('Google+', 'scribeseo'); ?></a> 
     11            <a class="nav-tab" href="#scribe-keyword-research-google-insights" id="scribe-keyword-research-google-insights-tab-identifier"><?php esc_html_e('Google Trends', 'scribeseo'); ?></a> 
    1212        </h3> 
    1313         
    1414        <div class="scribe-link-building-tab-section" id="scribe-keyword-research-suggestions"> 
    1515            <?php if( $previous ) { ?> 
    16             <p style="margin-top: 0;"><?php _e('This information is historical and may not be accurate.'); ?></p> 
     16            <p style="margin-top: 0;"><?php esc_html_e('This information is historical and may not be accurate.', 'scribeseo'); ?></p> 
    1717            <?php } ?> 
    1818             
     
    2121                    <tr valign="top"> 
    2222                        <th class="scribe-keyword-suggestions-target" scope="col"> 
    23                             <?php _e('Target', 'scribeseo' ); ?> 
    24                             <a class="scribe-help-marker" href="#" data-placement="right" rel="popover" data-content="<?php _e( 'A target keyword will be included in the Content Analysis of Scribe. You may select one target keyword.', 'scribeseo' ); ?>" title="<?php _e('Target', 'scribeseo' ); ?>">?</a> 
     23                            <?php esc_html_e('Target', 'scribeseo' ); ?> 
     24                            <a class="scribe-help-marker" href="#" data-placement="right" rel="popover" data-content="<?php esc_attr_e( 'A target keyword will be included in the Content Analysis of Scribe. You may select one target keyword.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Target', 'scribeseo' ); ?>">?</a> 
    2525                        </th> 
    2626                        <th class="scribe-keyword-suggestions-keyword" scope="col"> 
    27                             <?php _e('Keywords', 'scribeseo' ); ?> 
    28                             <a class="scribe-help-marker" href="#"  rel="popover" data-content="<?php _e( 'A list of recommended keywords for your consideration based on the keyword you entered.', 'scribeseo' ); ?>" title="<?php _e('Keywords', 'scribeseo' ); ?>">?</a> 
     27                            <?php esc_html_e('Keywords', 'scribeseo' ); ?> 
     28                            <a class="scribe-help-marker" href="#"  rel="popover" data-content="<?php esc_attr_e( 'A list of recommended keywords for your consideration based on the keyword you entered.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Keywords', 'scribeseo' ); ?>">?</a> 
    2929                        </th> 
    3030                        <th class="scribe-keyword-suggestions-popularity" scope="col"> 
    31                             <?php _e('Popularity', 'scribeseo' ); ?> 
    32                             <a class="scribe-help-marker" href="#"  rel="popover" data-content="<?php _e( 'Grades the overall popularity of a term. The higher the score, the more popular the term.', 'scribeseo' ); ?>" title="<?php _e('Popularity', 'scribeseo' ); ?>">?</a> 
     31                            <?php esc_html_e('Popularity', 'scribeseo' ); ?> 
     32                            <a class="scribe-help-marker" href="#"  rel="popover" data-content="<?php esc_attr_e( 'Grades the overall popularity of a term. The higher the score, the more popular the term.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Popularity', 'scribeseo' ); ?>">?</a> 
    3333                        </th> 
    3434                        <th class="scribe-keyword-suggestions-competition" scope="col"> 
    35                             <?php _e('Competition %', 'scribeseo' ); ?> 
    36                             <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php _e( 'The number of pages on the web that are targeting the keyword from an SEO perspective. The higher the number, the more competitive the term.', 'scribeseo' ); ?>" title="<?php _e('Competition', 'scribeseo' ); ?>">?</a> 
     35                            <?php esc_html_e('Competition %', 'scribeseo' ); ?> 
     36                            <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php esc_attr_e( 'The number of pages on the web that are targeting the keyword from an SEO perspective. The higher the number, the more competitive the term.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Competition', 'scribeseo' ); ?>">?</a> 
    3737                        </th> 
    3838                        <?php if($previous) { ?> 
    3939                        <th class="scribe-keyword-suggestions-date" scope="col"> 
    40                             <?php _e('Date', 'scribeseo' ); ?> 
    41                             <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php _e( 'The date when the keyword list was last generated.', 'scribeseo' ); ?>" title="<?php _e('Date', 'scribeseo' ); ?>">?</a> 
     40                            <?php esc_html_e('Date', 'scribeseo' ); ?> 
     41                            <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php esc_attr_e( 'The date when the keyword list was last generated.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Date', 'scribeseo' ); ?>">?</a> 
    4242                        </th> 
    4343                        <?php } ?> 
     
    4747                    <tr valign="top"> 
    4848                        <th class="scribe-keyword-suggestions-target" scope="col"> 
    49                             <?php _e('Target', 'scribeseo' ); ?> 
    50                             <a class="scribe-help-marker" href="#" data-placement="right" rel="popover" data-content="<?php _e( 'A target keyword will be included in the Content Analysis of Scribe. You may select one target keyword.', 'scribeseo' ); ?>" title="<?php _e('Target', 'scribeseo' ); ?>">?</a> 
     49                            <?php esc_html_e('Target', 'scribeseo' ); ?> 
     50                            <a class="scribe-help-marker" href="#" data-placement="right" rel="popover" data-content="<?php esc_attr_e( 'A target keyword will be included in the Content Analysis of Scribe. You may select one target keyword.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Target', 'scribeseo' ); ?>">?</a> 
    5151                        </th> 
    5252                        <th class="scribe-keyword-suggestions-keyword" scope="col"> 
    53                             <?php _e('Keywords', 'scribeseo' ); ?> 
    54                             <a class="scribe-help-marker" href="#"  rel="popover" data-content="<?php _e( 'A list of recommended keywords for your consideration based on the keyword you entered.', 'scribeseo' ); ?>" title="<?php _e('Keywords', 'scribeseo' ); ?>">?</a> 
     53                            <?php esc_html_e('Keywords', 'scribeseo' ); ?> 
     54                            <a class="scribe-help-marker" href="#"  rel="popover" data-content="<?php esc_attr_e( 'A list of recommended keywords for your consideration based on the keyword you entered.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Keywords', 'scribeseo' ); ?>">?</a> 
    5555                        </th> 
    5656                        <th class="scribe-keyword-suggestions-popularity" scope="col"> 
    57                             <?php _e('Popularity', 'scribeseo' ); ?> 
    58                             <a class="scribe-help-marker" href="#"  rel="popover" data-content="<?php _e( 'Grades the overall popularity of a term. The higher the score, the more popular the term.', 'scribeseo' ); ?>" title="<?php _e('Popularity', 'scribeseo' ); ?>">?</a> 
     57                            <?php esc_html_e('Popularity', 'scribeseo' ); ?> 
     58                            <a class="scribe-help-marker" href="#"  rel="popover" data-content="<?php esc_attr_e( 'Grades the overall popularity of a term. The higher the score, the more popular the term.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Popularity', 'scribeseo' ); ?>">?</a> 
    5959                        </th> 
    6060                        <th class="scribe-keyword-suggestions-competition" scope="col"> 
    61                             <?php _e('Competition %', 'scribeseo' ); ?> 
    62                             <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php _e( 'The number of pages on the web that are targeting the keyword from an SEO perspective. The higher the number, the more competitive the term.', 'scribeseo' ); ?>" title="<?php _e('Competition', 'scribeseo' ); ?>">?</a> 
     61                            <?php esc_html_e('Competition %', 'scribeseo' ); ?> 
     62                            <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php esc_attr_e( 'The number of pages on the web that are targeting the keyword from an SEO perspective. The higher the number, the more competitive the term.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Competition', 'scribeseo' ); ?>">?</a> 
    6363                        </th> 
    6464                        <?php if($previous) { ?> 
    6565                        <th class="scribe-keyword-suggestions-date" scope="col"> 
    66                             <?php _e('Date', 'scribeseo' ); ?> 
    67                             <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php _e( 'The date when the keyword list was last generated.', 'scribeseo' ); ?>" title="<?php _e('Date', 'scribeseo' ); ?>">?</a> 
     66                            <?php esc_html_e('Date', 'scribeseo' ); ?> 
     67                            <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php esc_attr_e( 'The date when the keyword list was last generated.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Date', 'scribeseo' ); ?>">?</a> 
    6868                        </th> 
    6969                        <?php } ?> 
     
    7474                    <tr valign="top"> 
    7575                        <?php if($previous) { ?> 
    76                         <td colspan="6"><?php _e('You don\'t currently have any saved keyword searches. Please <a class="scribe-thickbox-close" href="#">close this pop up</a> and do some keyword research.'); ?></td> 
     76                        <td colspan="6"><?php wp_kses( __( 'You don\'t currently have any saved keyword searches. Please <a class="scribe-thickbox-close" href="#">close this pop up</a> and do some keyword research.', 'scribeseo'), Scribe_SEO::formatting_allowedtags() ); ?></td> 
    7777                        <?php } else { ?> 
    78                         <td colspan="6"><?php _e('There are no keyword suggestions available for this keyword.'); ?></td>    
     78                        <td colspan="6"><?php esc_html_e('There are no keyword suggestions available for this keyword.', 'scribeseo'); ?></td>   
    7979                        <?php } ?> 
    8080                    </tr> 
     
    8383                    <tr valign="top"> 
    8484                        <th class="scribe-keyword-suggestions-target" scope="row"> 
    85                             <input <?php checked($target_term, $keyword->term); ?> type="radio" name="scribe-keyword-suggestions-target" value="<?php echo esc_html($keyword->term); ?>" /> 
     85                            <input <?php checked($target_term, $keyword->term); ?> type="radio" name="scribe-keyword-suggestions-target" value="<?php echo esc_attr($keyword->term); ?>" /> 
    8686                        </th> 
    8787                        <td class="scribe-keyword-suggestions-keyword"> 
    88                             <a rel="twipsy" title="<?php _e('More Details'); ?>" href="<?php scribe_the_upload_iframe_src('scribe-keyword-suggestions', 'scribe-keyword-details', array('scribe-keyword' => $queried_keyword, 'scribe-details-keyword' => $keyword->term, 'scribe-details-previous' => $previous)); ?>"><?php esc_html_e($keyword->term); ?></a> 
     88                            <a rel="twipsy" title="<?php esc_attr_e('More Details', 'scribeseo'); ?>" href="<?php scribe_the_upload_iframe_src('scribe-keyword-suggestions', 'scribe-keyword-details', array('scribe-keyword' => $queried_keyword, 'scribe-details-keyword' => $keyword->term, 'scribe-details-previous' => $previous)); ?>"><?php echo esc_html( $keyword->term ); ?></a> 
    8989                        </td> 
    9090                        <td class="scribe-keyword-suggestions-popularity"> 
     
    119119             
    120120            <?php if(!empty($keywords)) { ?> 
    121             <div id="scribe-keyword-suggestions-set-target-success" class="updated hide-if-js"><p><strong><?php _e('Your keyword, <span id="scribe-keyword-suggestions-set-target-success-keyword"></span>, will be included in your Content Analysis process.'); ?></strong> (<a href="#" class="scribe-thickbox-close"><?php _e('close'); ?></a>)</p></div> 
     121            <div id="scribe-keyword-suggestions-set-target-success" class="updated hide-if-js"><p><strong><?php esc_html_e('Your keyword, will be included in your Content Analysis process.', 'scribeseo'); ?></strong> (<a href="#" class="scribe-thickbox-close"><?php esc_html_e('close', 'scribeseo'); ?></a>)</p></div> 
    122122            <div class="clear"></div> 
    123123             
     
    125125                <?php wp_nonce_field('scribe-set-target-term', 'scribe-set-target-term-nonce'); ?> 
    126126                 
    127                 <p style="margin: 0 0 5px;"><?php _e('By selecting a Target Term above and clicking the Save Target Term button, your keyword will be included in the Content Analysis process.'); ?></p> 
    128                 <input class="button button-primary" data-post-id="<?php echo esc_attr( $_GET['post_id'] ); ?>" type="button" id="scribe-keyword-suggestions-set-target" name="scribe-keyword-suggestions-set-target" value="<?php _e('Save Target Term'); ?>" /> 
     127                <p style="margin: 0 0 5px;"><?php esc_html_e('By selecting a Target Term above and clicking the Save Target Term button, your keyword will be included in the Content Analysis process.', 'scribeseo'); ?></p> 
     128                <input class="button button-primary" data-post-id="<?php echo esc_attr( $_GET['post_id'] ); ?>" type="button" id="scribe-keyword-suggestions-set-target" name="scribe-keyword-suggestions-set-target" value="<?php esc_attr_e('Save Target Term', 'scribeseo'); ?>" /> 
    129129                <img id="scribe-keyword-research-set-target-term-ajax-feedback" alt="" title="" class="scribe-ajax-feedback" src="<?php esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" style="visibility: hidden;"> 
    130130         
    131131                <span class="scribe-keyword-research-clear-target-term-container"> 
    132                     (<a class="scribe-clear-target-term" href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'scribe_clear_target_term', 'scribe-post-id' => $_GET['post_id'] ), admin_url( 'admin-ajax.php' ) ), 'scribe-clear-target-term' ); ?>"><?php _e( 'clear', 'scribeseo' ); ?></a>) 
     132                    (<a class="scribe-clear-target-term" href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'scribe_clear_target_term', 'scribe-post-id' => (int)$_GET['post_id'] ), admin_url( 'admin-ajax.php' ) ), 'scribe-clear-target-term' ); ?>"><?php esc_html_e( 'clear', 'scribeseo' ); ?></a>) 
    133133                </span> 
    134134            </div> 
     
    140140                <tbody> 
    141141                    <tr valign="top"> 
    142                         <th scope="row"><label for="scribe-keyword-research-twitter-headlines-term"><?php _e('Headline Suggestions for'); ?></label></th> 
     142                        <th scope="row"><label for="scribe-keyword-research-twitter-headlines-term"><?php esc_html_e('Headline Suggestions for', 'scribeseo'); ?></label></th> 
    143143                        <td> 
    144144                            <select class="scribe-keyword-research-headlines-term-select scribe-select-new" id="scribe-keyword-research-twitter-headlines-term"> 
     
    147147                                <?php } ?> 
    148148                            </select> 
    149                             <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php _e( 'Find out what people are tweeting for this keyword.', 'scribeseo' ); ?>" title="<?php _e('Twitter', 'scribeseo' ); ?>">?</a> 
     149                            <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php esc_attr_e( 'Find out what people are tweeting for this keyword.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Twitter', 'scribeseo' ); ?>">?</a> 
    150150                        </td> 
    151151                        <td style="width:10%"></td> 
     
    193193                <tbody> 
    194194                    <tr valign="top"> 
    195                         <th scope="row"><label for="scribe-keyword-research-google-plus-headlines-term"><?php _e('Headline Suggestions for'); ?></label></th> 
     195                        <th scope="row"><label for="scribe-keyword-research-google-plus-headlines-term"><?php esc_html_e('Headline Suggestions for', 'scribeseo'); ?></label></th> 
    196196                        <td> 
    197197                            <select class="scribe-keyword-research-headlines-term-select scribe-select-new scribe-select-changed" id="scribe-keyword-research-google-plus-headlines-term"> 
     
    200200                                <?php } ?> 
    201201                            </select> 
    202                             <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php _e( 'Find out what people are saying for this keyword.', 'scribeseo' ); ?>" title="<?php _e('Google+', 'scribeseo' ); ?>">?</a> 
     202                            <a class="scribe-help-marker" href="#" data-placement="left" rel="popover" data-content="<?php esc_attr_e( 'Find out what people are saying for this keyword.', 'scribeseo' ); ?>" title="<?php esc_attr_e('Google+', 'scribeseo' ); ?>">?</a> 
    203203                        </td> 
    204204                        <td> 
     
    218218                <tbody> 
    219219                    <tr valign="top"> 
    220                         <th scope="row"><label for="scribe-keyword-research-google-insights-term"><?php _e('Insights for'); ?></label></th> 
     220                        <th scope="row"><label for="scribe-keyword-research-google-insights-term"><?php esc_html_e('Trends for', 'scribeseo'); ?></label></th> 
    221221                        <td> 
    222222                            <select class="scribe-keyword-research-headlines-term-select scribe-select-new js-on-load" id="scribe-keyword-research-google-insights-headlines-term"> 
  • scribe/trunk/views/backend/link-building/analysis.php

    r614019 r642313  
    2323        <tbody> 
    2424            <tr class="scribe-link-building-keyword-select-row"> 
    25                 <th scope="row"><label for="scribe-link-building-keywords"><?php _e('Select Keywords:'); ?></label></th> 
     25                <th scope="row"><label for="scribe-link-building-keywords"><?php esc_html_e('Select Keywords:', 'scribeseo'); ?></label></th> 
    2626                <td> 
    2727                    <select name="scribe-link-building-keywords" id="scribe-link-building-keywords"> 
    28                         <option value=""><?php _e('Select from the list'); ?></option> 
     28                        <option value=""><?php esc_html_e('Select from the list', 'scribeseo'); ?></option> 
    2929                        <?php foreach( $content_analysis_keywords as $keyword ) { ?> 
    3030                        <option <?php if( in_array( ucwords( $keyword ), $link_building_keywords ) ) { ?> style="display: none;" <?php } ?> value="<?php echo esc_attr( ucwords( $keyword ) ); ?>"><?php echo esc_html( ucwords( $keyword ) ); ?></option> 
    3131                        <?php } ?> 
    3232                    </select> 
    33                     <input type="button" class="button button-secondary" id="scribe-link-building-add-keyword" value="<?php _e('Add Keyword'); ?>" /> 
     33                    <input type="button" class="button button-secondary" id="scribe-link-building-add-keyword" value="<?php esc_html_e('Add Keyword', 'scribeseo'); ?>" /> 
    3434                </td> 
    3535            </tr> 
    3636            <tr class="scribe-link-building-keyword-row"> 
    37                 <th scope="row"><?php _e('Keyword List:'); ?></th> 
     37                <th scope="row"><?php esc_html_e('Keyword List:', 'scribeseo'); ?></th> 
    3838                <td> 
    39                     <span id="scribe-link-building-keyword-list-empty"><?php _e('Please add some keywords.'); ?></span> 
     39                    <span id="scribe-link-building-keyword-list-empty"><?php esc_html_e('Please add some keywords.', 'scribeseo'); ?></span> 
    4040                    <ul id="scribe-link-building-keyword-list"> 
    4141                        <?php 
     
    5353                    <div class="clear"></div> 
    5454                    <div class="scribe-link-building-research-submit"> 
    55                         <input type="button" class="button button-primary" name="scribe-link-building-do-link-building-research" id="scribe-link-building-do-link-building-research" value="<?php _e('Research'); ?>" /> 
     55                        <input type="button" class="button button-primary" name="scribe-link-building-do-link-building-research" id="scribe-link-building-do-link-building-research" value="<?php esc_html_e('Research', 'scribeseo'); ?>" /> 
    5656                        <img id="scribe-build-links-ajax-feedback" alt="" title="" class="scribe-ajax-feedback" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" style="visibility: hidden;"> 
    5757                    </div> 
     
    6161    </table> 
    6262    </div> 
    63     <div class="scribe-link-building-tabs" data-link-building-complete="<?php echo $link_building_complete; ?>"> 
     63    <div class="scribe-link-building-tabs" data-link-building-complete="<?php echo esc_attr( $link_building_complete ); ?>"> 
    6464        <div id="scribe-link-building-internal-links"> 
    6565            <table class="widefat" class="scribe-link-building-internal-links-table"> 
    6666                <thead> 
    6767                    <tr> 
    68                         <th scope="col"><?php _e( 'Page Title', 'scribeseo' ); ?></th> 
    69                         <th scope="col"><?php _e( 'Page Authority', 'scribeseo' ); ?></th> 
    70                         <th scope="col"><?php _e( 'Links', 'scribeseo' ); ?></th> 
     68                        <th scope="col"><?php esc_html_e( 'Page Title', 'scribeseo' ); ?></th> 
     69                        <th scope="col"><?php esc_html_e( 'Page Authority', 'scribeseo' ); ?></th> 
     70                        <th scope="col"><?php esc_html_e( 'Links', 'scribeseo' ); ?></th> 
    7171                    </tr> 
    7272                </thead> 
    7373                <tfoot> 
    7474                    <tr> 
    75                         <th scope="col"><?php _e( 'Page Title', 'scribeseo' ); ?></th> 
    76                         <th scope="col"><?php _e( 'Page Authority', 'scribeseo' ); ?></th> 
    77                         <th scope="col"><?php _e( 'Links', 'scribeseo' ); ?></th> 
     75                        <th scope="col"><?php esc_html_e( 'Page Title', 'scribeseo' ); ?></th> 
     76                        <th scope="col"><?php esc_html_e( 'Page Authority', 'scribeseo' ); ?></th> 
     77                        <th scope="col"><?php esc_html_e( 'Links', 'scribeseo' ); ?></th> 
    7878                    </tr> 
    7979                </tfoot> 
    8080                <tbody> 
    8181                    <tr id="scribe-link-building-internal-links-row-none" <?php echo empty( $link_building_info->internalLinks ) ? '' : 'style="display:none;"'; ?>> 
    82                         <td class="scribe-link-building-internal-links-row-page-title"><?php _e( 'No results found. Please check your Scribe Settings or retry your research.', 'scribeseo' ); ?></td> 
     82                        <td class="scribe-link-building-internal-links-row-page-title"><?php esc_html_e( 'No results found. Please check your Scribe Settings or retry your research.', 'scribeseo' ); ?></td> 
    8383                        <td class="scribe-link-building-internal-links-row-page-authority"></td> 
    8484                        <td class="scribe-link-building-internal-links-row-page-links"></td> 
     
    9595                    ?> 
    9696                    <tr> 
    97                         <td class="scribe-link-building-internal-links-row-page-title"><a href="http://supportfiles.scribeseo.com/post-internal-links.aspx?kwds=<?php echo $keywords_imploded; ?>&amp;url=<?php echo urlencode( $internal->url ); ?>" target="_blank"><?php echo $internal->pageTitle; ?></a></td> 
     97                        <td class="scribe-link-building-internal-links-row-page-title"><a href="http://supportfiles.scribeseo.com/post-internal-links.aspx?kwds=<?php echo $keywords_imploded; ?>&amp;url=<?php echo urlencode( $internal->url ); ?>" target="_blank"><?php echo esc_html( $internal->pageTitle ); ?></a></td> 
    9898                        <td class="scribe-link-building-internal-links-row-page-authority"><?php printf( '%.0f', $internal->pageAuthority ); ?></td> 
    9999                        <td class="scribe-link-building-internal-links-row-page-links"><?php echo number_format( $internal->numberOfPagesToUrl, 0 ); ?></td> 
  • scribe/trunk/views/backend/link-building/connections.php

    r614019 r642313  
    22    <div class="scribe-link-building-tabs" data-link-building-complete="<?php echo esc_attr( $link_building_complete ); ?>"> 
    33        <h3 class="nav-tab-wrapper scribe-link-building-tabs-identifiers"> 
    4             <a class="nav-tab" href="#scribe-link-building-difficulty" id="scribe-link-building-difficulty-tab-identifier"><?php _e('Difficulty Score'); ?></a> 
    5             <a class="nav-tab" href="#scribe-link-building-external-links" id="scribe-link-building-external-links-tab-identifier" <?php echo scribe_get_link_building_tab_load( $link_building_info, 'ext' ); ?>><?php _e('External Links'); ?></a> 
    6             <a class="nav-tab" href="#scribe-link-building-internal-links" id="scribe-link-building-internal-links-tab-identifier" <?php echo scribe_get_link_building_tab_load( $link_building_info, 'int' ); ?>><?php _e('Internal Links'); ?></a> 
    7             <a class="nav-tab" href="#scribe-link-building-social-media" id="scribe-link-building-social-media-tab-identifier" <?php echo scribe_get_link_building_tab_load( $link_building_info, 'soc' ); ?>><?php _e('Social Media'); ?></a> 
     4            <a class="nav-tab" href="#scribe-link-building-difficulty" id="scribe-link-building-difficulty-tab-identifier"><?php esc_html_e('Difficulty Score', 'scribeseo'); ?></a> 
     5            <a class="nav-tab" href="#scribe-link-building-external-links" id="scribe-link-building-external-links-tab-identifier" <?php echo scribe_get_link_building_tab_load( $link_building_info, 'ext' ); ?>><?php esc_html_e('External Links', 'scribeseo'); ?></a> 
     6            <a class="nav-tab" href="#scribe-link-building-internal-links" id="scribe-link-building-internal-links-tab-identifier" <?php echo scribe_get_link_building_tab_load( $link_building_info, 'int' ); ?>><?php esc_html_e('Internal Links', 'scribeseo'); ?></a> 
     7            <a class="nav-tab" href="#scribe-link-building-social-media" id="scribe-link-building-social-media-tab-identifier" <?php echo scribe_get_link_building_tab_load( $link_building_info, 'soc' ); ?>><?php esc_html_e('Social Media', 'scribeseo'); ?></a> 
    88        </h3> 
    99    </div> 
     
    1616        <tbody> 
    1717            <tr class="scribe-link-building-keyword-select-row"> 
    18                 <th scope="row"><label for="scribe-link-building-keywords"><?php _e('Select Keywords:'); ?></label></th> 
     18                <th scope="row"><label for="scribe-link-building-keywords"><?php esc_html_e('Select Keywords:', 'scribeseo'); ?></label></th> 
    1919                <td> 
    2020                    <select name="scribe-link-building-keywords" id="scribe-link-building-keywords"> 
    21                         <option value=""><?php _e('Select from the list'); ?></option> 
     21                        <option value=""><?php esc_html_e('Select from the list', 'scribeseo'); ?></option> 
    2222                        <?php foreach( $content_analysis_keywords as $keyword ) { ?> 
    2323                        <option <?php if( in_array( ucwords( $keyword ), $link_building_keywords ) ) { ?> style="display: none;" <?php } ?> value="<?php echo esc_attr( ucwords( $keyword ) ); ?>"><?php echo esc_html( ucwords( $keyword ) ); ?></option> 
    2424                        <?php } ?> 
    2525                    </select> 
    26                     <input type="button" class="button button-secondary" id="scribe-link-building-add-keyword" value="<?php _e('Add Keyword'); ?>" /> 
     26                    <input type="button" class="button button-secondary" id="scribe-link-building-add-keyword" value="<?php esc_html_e('Add Keyword', 'scribeseo'); ?>" /> 
    2727                </td> 
    2828            </tr> 
    2929            <tr class="scribe-link-building-keyword-row"> 
    30                 <th scope="row"><?php _e('Keyword List:'); ?></th> 
     30                <th scope="row"><?php esc_html_e('Keyword List:', 'scribeseo'); ?></th> 
    3131                <td> 
    32                     <span id="scribe-link-building-keyword-list-empty"><?php _e('Please add some keywords.'); ?></span> 
     32                    <span id="scribe-link-building-keyword-list-empty"><?php esc_html_e('Please add some keywords.', 'scribeseo'); ?></span> 
    3333                    <ul id="scribe-link-building-keyword-list"> 
    3434                        <?php 
     
    4646                    <div class="clear"></div> 
    4747                    <div class="scribe-link-building-research-submit"> 
    48                         <input type="button" class="button button-primary" name="scribe-link-building-do-link-building-research" id="scribe-link-building-do-link-building-research" value="<?php _e('Research'); ?>" /> 
     48                        <input type="button" class="button button-primary" name="scribe-link-building-do-link-building-research" id="scribe-link-building-do-link-building-research" value="<?php esc_html_e('Research', 'scribeseo'); ?>" /> 
    4949                        <img id="scribe-build-links-ajax-feedback" alt="" title="" class="scribe-ajax-feedback" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" style="visibility: hidden;"> 
    5050                    </div> 
     
    7272                your audience is looking for.</p> 
    7373            </div> 
    74             <h3 class="scribe-link-building-tab-difficulty-header"><?php printf( __( 'Link Difficulty Score for %s', 'scribeseo' ), esc_html( implode( ' + ', (array) $link_building_info->keywords ) ) ); ?></h3> 
     74            <h3 class="scribe-link-building-tab-difficulty-header"><?php printf( esc_html__( 'Link Difficulty Score for %s', 'scribeseo' ), implode( ' + ', (array) $link_building_info->keywords ) ); ?></h3> 
    7575             
    7676            <div class="scribe-link-building-tab-difficulty-score-container scribe-popup-analysis-score-wrap"> 
     
    106106                <thead> 
    107107                    <tr> 
    108                         <th scope="col"><?php _e('URL'); ?></th> 
    109                         <th scope="col"><?php _e('Page Authority'); ?></th> 
    110                         <th scope="col"><?php _e('Contact Name'); ?></th> 
    111                         <!-- th scope="col"><?php _e('Organization'); ?></th --> 
    112                         <th scope="col"><?php _e('Telephone'); ?></th> 
    113                         <th scope="col"><?php _e( 'Links', 'scribeseo' ); ?></th> 
     108                        <th scope="col"><?php esc_html_e('URL', 'scribeseo'); ?></th> 
     109                        <th scope="col"><?php esc_html_e('Page Authority', 'scribeseo'); ?></th> 
     110                        <th scope="col"><?php esc_html_e('Contact Name', 'scribeseo'); ?></th> 
     111                        <th scope="col"><?php esc_html_e('Telephone', 'scribeseo'); ?></th> 
     112                        <th scope="col"><?php esc_html_e( 'Links', 'scribeseo' ); ?></th> 
    114113                    </tr> 
    115114                </thead> 
    116115                <tfoot> 
    117116                    <tr> 
    118                         <th scope="col"><?php _e('URL'); ?></th> 
    119                         <th scope="col"><?php _e('Page Authority'); ?></th> 
    120                         <th scope="col"><?php _e('Contact Name'); ?></th> 
    121                         <!-- th scope="col"><?php _e('Organization'); ?></th--> 
    122                         <th scope="col"><?php _e('Telephone'); ?></th> 
    123                         <th scope="col"><?php _e( 'Links', 'scribeseo' ); ?></th> 
     117                        <th scope="col"><?php esc_html_e('URL', 'scribeseo'); ?></th> 
     118                        <th scope="col"><?php esc_html_e('Page Authority', 'scribeseo'); ?></th> 
     119                        <th scope="col"><?php esc_html_e('Contact Name', 'scribeseo'); ?></th> 
     120                        <th scope="col"><?php esc_html_e('Telephone', 'scribeseo'); ?></th> 
     121                        <th scope="col"><?php esc_html_e( 'Links', 'scribeseo' ); ?></th> 
    124122                    </tr> 
    125123                </tfoot> 
    126124                <tbody> 
    127125                    <tr id="scribe-link-building-external-links-row-placeholder"> 
    128                         <td class="scribe-link-building-external-links-row-url"><?php _e('Not Available'); ?></td> 
    129                         <td class="scribe-link-building-external-links-row-domain-authority"><?php _e('Not Available'); ?></td> 
     126                        <td class="scribe-link-building-external-links-row-url"><?php esc_html_e('Not Available', 'scribeseo'); ?></td> 
     127                        <td class="scribe-link-building-external-links-row-domain-authority"><?php esc_html_e('Not Available', 'scribeseo'); ?></td> 
    130128                        <td> 
    131                             <span class="scribe-link-building-external-links-row-contact-name"><?php _e('Not Available'); ?></span> 
    132                             <span class="scribe-link-building-external-links-row-organization"></span> 
    133                         </td> 
    134                         <td class="scribe-link-building-external-links-row-telephone"><?php _e('Not Available'); ?></td> 
    135                         <td class="scribe-link-building-external-links-row-links"><?php _e('Not Available'); ?></td> 
     129                            <span class="scribe-link-building-external-links-row-contact-name"><?php esc_html_e('Not Available', 'scribeseo'); ?></span> 
     130                        </td> 
     131                        <td class="scribe-link-building-external-links-row-telephone"><?php esc_html_e('Not Available', 'scribeseo'); ?></td> 
     132                        <td class="scribe-link-building-external-links-row-links"><?php esc_html_e('Not Available', 'scribeseo'); ?></td> 
    136133                    </tr> 
    137134                    <?php  
     
    143140                            <?php  
    144141                            if ( empty( $external->url ) ) { 
    145                                 _e( '-', 'scribseo' ); 
     142                                esc_html_e( '-', 'scribseo'); 
    146143                            } else { 
    147144                                printf( '<a href="%s">%s</a>', esc_url( $external->url ), esc_html( parse_url( $external->url, PHP_URL_HOST ) ) ); 
     
    152149                            <?php  
    153150                            if ( empty( $external->url ) ) { 
    154                                 _e( '-', 'scribseo' ); 
     151                                esc_html_e( '-', 'scribeseo'); 
    155152                            } else { 
    156153                                printf( '<a href="http://www.opensiteexplorer.org/links?site=%s">%.0f</a>', esc_url( $external->url ), $external->pageAuthority ); 
     
    169166                                printf( '<a href="mailto:%1$s">%1$s</a>', esc_attr( $external->email ) ); 
    170167                            } else { 
    171                                 _e( '-', 'scribseo' ); 
     168                                esc_html_e( '-', 'scribeseo'); 
    172169                            } 
    173170                            ?> 
    174                         <!-- /td> 
    175                         <td class="scribe-link-building-external-links-row-organization" --> 
    176                             <?php 
    177                             if ( empty( $external->organization ) ) { 
    178                                 _e( '-', 'scribseo' ); 
    179                             } else { 
    180                                 printf( __( ' at %s', 'scribeseo' ), esc_html( $external->organization ) ); 
    181                             } 
    182                             ?> 
    183171                        </td> 
    184172                        <td class="scribe-link-building-external-links-row-telephone"> 
    185                             <?php echo empty( $external->telephone ) ? __( '-', 'scribseo' ) : esc_html( $external->telephone ); ?> 
     173                            <?php echo empty( $external->telephone ) ? esc_html__( '-', 'scribseo' , 'scribeseo') : esc_html( $external->telephone ); ?> 
    186174                        </td> 
    187175                        <td class="scribe-link-building-external-links-row-links"> 
    188                             <?php echo empty( $external->numberOfPagesToUrl ) ? __( '-', 'scribseo' ) : (int) $external->numberOfPagesToUrl; ?> 
     176                            <?php echo empty( $external->numberOfPagesToUrl ) ? esc_html__( '-', 'scribseo' , 'scribeseo') : (int) $external->numberOfPagesToUrl; ?> 
    189177                        </td> 
    190178                    </tr> 
     
    215203                <thead> 
    216204                    <tr> 
    217                         <th scope="col"><?php _e('Page Title'); ?></th> 
    218                         <th scope="col"><?php _e('Page Authority'); ?></th> 
     205                        <th scope="col"><?php esc_html_e('Page Title', 'scribeseo'); ?></th> 
     206                        <th scope="col"><?php esc_html_e('Page Authority', 'scribeseo'); ?></th> 
    219207                    </tr> 
    220208                </thead> 
    221209                <tfoot> 
    222210                    <tr> 
    223                         <th scope="col"><?php _e('Page Title'); ?></th> 
    224                         <th scope="col"><?php _e('Page Authority'); ?></th> 
     211                        <th scope="col"><?php esc_html_e('Page Title', 'scribeseo'); ?></th> 
     212                        <th scope="col"><?php esc_html_e('Page Authority', 'scribeseo'); ?></th> 
    225213                    </tr> 
    226214                </tfoot> 
    227215                <tbody> 
    228216                    <tr id="scribe-link-building-internal-links-row-none" <?php echo empty( $link_building_info->internalLinks ) ? '' : 'style="display:none;"'; ?>> 
    229                         <td class="scribe-link-building-internal-links-row-page-title"><?php _e( 'No results found. Please check your Scribe Settings or retry your research.', 'scribeseo' ); ?></td> 
     217                        <td class="scribe-link-building-internal-links-row-page-title"><?php esc_html_e( 'No results found. Please check your Scribe Settings or retry your research.', 'scribeseo' ); ?></td> 
    230218                        <td class="scribe-link-building-internal-links-row-page-authority"></td> 
    231219                    </tr> 
     
    281269    </ul> 
    282270</div> 
    283  
    284 <script src="http://platform.linkedin.com/in.js" type="text/javascript"></script> 
  • scribe/trunk/views/backend/meta-boxes/account.php

    r614019 r642313  
    22    <tbody> 
    33        <tr valign="top"> 
    4             <th scope="row"><?php _e('Account Status'); ?></th> 
     4            <th scope="row"><?php esc_html_e('Account Status', 'scribeseo'); ?></th> 
    55            <td> 
    6                 <?php echo ( $account->accountStatus ? __( 'Active', 'scribeseo' ) : __( 'Inactive', 'scribeseo' ) ); ?> 
     6                <?php echo ( $account->accountStatus ? esc_html__( 'Active', 'scribeseo' ) : esc_html__( 'Inactive', 'scribeseo' ) ); ?> 
    77            </td> 
    88        </tr> 
    99        <tr valign="top"> 
    10             <th scope="row"><?php _e('Account Type'); ?></th> 
     10            <th scope="row"><?php esc_html_e('Account Type', 'scribeseo'); ?></th> 
    1111            <td> 
    12                 <?php echo ( $account->accountType ? __( 'Professional', 'scribeseo' ) : __( 'Developer', 'scribeseo' ) ); ?> 
     12                <?php echo ( $account->accountType ? esc_html__( 'Professional', 'scribeseo' ) : esc_html__( 'Developer', 'scribeseo' ) ); ?> 
    1313            </td> 
    1414        </tr> 
     
    3333         
    3434        <tr valign="top"> 
    35             <th scope="row"><?php _e( 'Evaluations', 'scribeseo' ); ?></th> 
     35            <th scope="row"><?php esc_html_e( 'Evaluations', 'scribeseo' ); ?></th> 
    3636            <td> 
    37                 <?php printf( __( '%1$s Evaluations Per Month (1 Evaluation = 1 SEO Analysis)', 'scribeseo' ), number_format_i18n( $ca_evaluation_data->total ) ); ?> 
     37                <?php printf( esc_html__( '%1$s Evaluations Per Month (1 Evaluation = 1 SEO Analysis)', 'scribeseo' ), number_format_i18n( $ca_evaluation_data->total ) ); ?> 
    3838            </td> 
    3939        </tr> 
    4040        <tr valign="top"> 
    41             <th scope="row"><?php _e( 'Evaluations Left', 'scribeseo' ); ?></th> 
     41            <th scope="row"><?php esc_html_e( 'Evaluations Left', 'scribeseo' ); ?></th> 
    4242            <td> 
    43                 <?php printf( __( '%1$s Evaluations as of %2$s', 'scribeseo' ), number_format_i18n( $ca_evaluation_data->remaining ), esc_html( $current_date ) ); ?><br /> 
    44                 <?php printf( __( 'Monthly evaluations will be reset at %1$s', 'scribeseo' ), esc_html( $next_month_date ) ); ?> 
     43                <?php printf( esc_html__( '%1$s Evaluations as of %2$s', 'scribeseo' ), number_format_i18n( $ca_evaluation_data->remaining ), esc_html( $current_date ) ); ?><br /> 
     44                <?php printf( esc_html__( 'Monthly evaluations will be reset at %1$s', 'scribeseo' ), esc_html( $next_month_date ) ); ?> 
    4545            </td> 
    4646        </tr> 
    4747        <tr valign="top"> 
    48             <th scope="row"><?php _e( 'Keyword Evaluations', 'scribeseo' ); ?></th> 
     48            <th scope="row"><?php esc_html_e( 'Keyword Evaluations', 'scribeseo' ); ?></th> 
    4949            <td> 
    50                 <?php printf( __( '%1$s Evaluations Per Month (1 Evaluation = 1 Keyword Research)', 'scribeseo' ), number_format_i18n( $kw_evaluation_data->total ) ); ?> 
     50                <?php printf( esc_html__( '%1$s Evaluations Per Month (1 Evaluation = 1 Keyword Research)', 'scribeseo' ), number_format_i18n( $kw_evaluation_data->total ) ); ?> 
    5151            </td> 
    5252        </tr> 
    5353        <tr valign="top"> 
    54             <th scope="row"><?php _e( 'Keyword Evaluations Left', 'scribeseo' ); ?></th> 
     54            <th scope="row"><?php esc_html_e( 'Keyword Evaluations Left', 'scribeseo' ); ?></th> 
    5555            <td> 
    56                 <?php printf( __( '%1$s Evaluations as of %2$s', 'scribeseo' ), number_format_i18n( $kw_evaluation_data->remaining ), esc_html( $current_date ) ); ?><br /> 
    57                 <?php printf( __( 'Monthly evaluations will be reset at %1$s', 'scribeseo' ), esc_html( $next_month_date ) ); ?> 
     56                <?php printf( esc_html__( '%1$s Evaluations as of %2$s', 'scribeseo' ), number_format_i18n( $kw_evaluation_data->remaining ), esc_html( $current_date ) ); ?><br /> 
     57                <?php printf( esc_html__( 'Monthly evaluations will be reset at %1$s', 'scribeseo' ), esc_html( $next_month_date ) ); ?> 
    5858            </td> 
    5959        </tr> 
  • scribe/trunk/views/backend/meta-boxes/compatibility-info.php

    r614019 r642313  
    33    <tbody> 
    44        <tr valign="top"> 
    5             <th scope="row"><label for="scribe-compatibility-name"><?php _e('Your Name'); ?></label></th> 
     5            <th scope="row"><label for="scribe-compatibility-name"><?php _e('Your Name', 'scribeseo'); ?></label></th> 
    66            <td> 
    7                 <input class="regular-text" type="text" name="scribe-compatibility[name]" id="scribe-compatibility-name" value="<?php esc_attr_e($user->display_name); ?>" /> 
     7                <input class="regular-text" type="text" name="scribe-compatibility[name]" id="scribe-compatibility-name" value="<?php esc_attr( $user->display_name ); ?>" /> 
    88            </td> 
    99        </tr> 
    1010        <tr valign="top"> 
    11             <th scope="row"><label for="scribe-compatibility-email"><?php _e('Your Email'); ?></label></th> 
     11            <th scope="row"><label for="scribe-compatibility-email"><?php _e('Your Email', 'scribeseo'); ?></label></th> 
    1212            <td> 
    13                 <input class="regular-text" type="text" name="scribe-compatibility[email]" id="scribe-compatibility-email" value="<?php esc_attr_e(get_option('admin_email')); ?>" /> 
     13                <input class="regular-text" type="text" name="scribe-compatibility[email]" id="scribe-compatibility-email" value="<?php esc_attr( get_option( 'admin_email' ) ); ?>" /> 
    1414            </td> 
    1515        </tr> 
    1616        <tr valign="top"> 
    17             <th scope="row"><label for="scribe-compatibility-issue"><?php _e('Your Issue or Comments'); ?></label></th> 
     17            <th scope="row"><label for="scribe-compatibility-issue"><?php _e('Your Issue or Comments', 'scribeseo'); ?></label></th> 
    1818            <td> 
    1919                <textarea class="large-text" rows="6" name="scribe-compatibility[issue]" id="scribe-compatibility-issue"></textarea><br /> 
  • scribe/trunk/views/backend/meta-boxes/connections.php

    r614019 r642313  
    22    <div class="scribe-link-building-tabs" data-link-building-complete="<?php echo esc_attr( $link_building_complete ); ?>"> 
    33        <div class="nav-tab-wrapper scribe-link-building-tabs-identifiers"> 
    4             <a class="nav-tab" href="#scribe-link-building-difficulty" id="scribe-link-building-difficulty-tab-identifier"><?php _e( 'Site Score', 'scribeseo' ); ?></a> 
    5             <a class="nav-tab" href="#scribe-link-building-external-links" id="scribe-link-building-external-links-tab-identifier" <?php echo scribe_get_link_building_tab_load( null, 'ext' ); ?>><?php _e('External Links'); ?></a> 
    6             <a class="nav-tab" href="#scribe-link-building-social-media" id="scribe-link-building-social-media-tab-identifier" <?php echo scribe_get_link_building_tab_load( null, 'soc' ); ?>><?php _e('Social Media'); ?></a> 
     4            <a class="nav-tab" href="#scribe-link-building-difficulty" id="scribe-link-building-difficulty-tab-identifier"><?php esc_html_e( 'Site Score', 'scribeseo' ); ?></a> 
     5            <a class="nav-tab" href="#scribe-link-building-external-links" id="scribe-link-building-external-links-tab-identifier" <?php echo scribe_get_link_building_tab_load( null, 'ext' ); ?>><?php esc_html_e('External Links', 'scribeseo'); ?></a> 
     6            <a class="nav-tab" href="#scribe-link-building-social-media" id="scribe-link-building-social-media-tab-identifier" <?php echo scribe_get_link_building_tab_load( null, 'soc' ); ?>><?php esc_html_e('Social Media', 'scribeseo'); ?></a> 
    77        </div> 
    88    </div> 
     
    1313    <input type="hidden" name="post_ID" id="post_ID" value="<?php echo esc_attr( $post_id ); ?>" /> 
    1414            <div class="scribe-link-building-keyword-select-row"> 
    15                 <span><label for="scribe-link-building-keywords"><?php _e('Keywords:'); ?></label></span> 
     15                <span><label for="scribe-link-building-keywords"><?php esc_html_e('Keywords:', 'scribeseo'); ?></label></span> 
    1616                <span> 
    1717                    <input type="text" name="scribe-link-building-keywords" id="scribe-site-connections-keywords"> 
    1818                </span> 
    1919                <span class="alignright scribe-site-connections-research-submit"> 
    20                         <input type="button" class="button button-primary" name="scribe-link-building-do-site-connections-research" id="scribe-link-building-do-site-connections-research" value="<?php _e('Research'); ?>" /> 
     20                        <input type="button" class="button button-primary" name="scribe-link-building-do-site-connections-research" id="scribe-link-building-do-site-connections-research" value="<?php esc_html_e('Research', 'scribeseo'); ?>" /> 
    2121                        <img id="scribe-build-links-ajax-feedback" alt="" title="" class="scribe-ajax-feedback" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" style="visibility: hidden;"> 
    2222                </span> 
     
    5050            </div> 
    5151             
    52             <?php echo esc_html( $score_help_text ); ?> 
    5352        </div> 
    5453        <div class="scribe-link-building-tab-section" id="scribe-link-building-external-links"> 
     
    7675                <thead> 
    7776                    <tr> 
    78                         <th scope="col"><?php _e('URL'); ?></th> 
    79                         <th scope="col"><?php _e('Page Authority'); ?></th> 
    80                         <th scope="col"><?php _e('Contact Name'); ?></th> 
    81                         <th scope="col"><?php _e('Telephone'); ?></th> 
    82                         <th scope="col"><?php _e( 'Links', 'scribeseo' ); ?></th> 
     77                        <th scope="col"><?php esc_html_e('URL', 'scribeseo'); ?></th> 
     78                        <th scope="col"><?php esc_html_e('Page Authority', 'scribeseo'); ?></th> 
     79                        <th scope="col"><?php esc_html_e('Contact Name', 'scribeseo'); ?></th> 
     80                        <th scope="col"><?php esc_html_e('Telephone', 'scribeseo'); ?></th> 
     81                        <th scope="col"><?php esc_html_e( 'Links', 'scribeseo' ); ?></th> 
    8382                    </tr> 
    8483                </thead> 
    8584                <tfoot> 
    8685                    <tr> 
    87                         <th scope="col"><?php _e('URL'); ?></th> 
    88                         <th scope="col"><?php _e('Page Authority'); ?></th> 
    89                         <th scope="col"><?php _e('Contact Name'); ?></th> 
    90                         <th scope="col"><?php _e('Telephone'); ?></th> 
    91                         <th scope="col"><?php _e( 'Links', 'scribeseo' ); ?></th> 
     86                        <th scope="col"><?php esc_html_e('URL', 'scribeseo'); ?></th> 
     87                        <th scope="col"><?php esc_html_e('Page Authority', 'scribeseo'); ?></th> 
     88                        <th scope="col"><?php esc_html_e('Contact Name', 'scribeseo'); ?></th> 
     89                        <th scope="col"><?php esc_html_e('Telephone', 'scribeseo'); ?></th> 
     90                        <th scope="col"><?php esc_html_e( 'Links', 'scribeseo' ); ?></th> 
    9291                    </tr> 
    9392                </tfoot> 
    9493                <tbody> 
    9594                    <tr id="scribe-link-building-external-links-row-placeholder"> 
    96                         <td class="scribe-link-building-external-links-row-url"><?php _e('Not Available'); ?></td> 
    97                         <td class="scribe-link-building-external-links-row-domain-authority"><?php _e('Not Available'); ?></td> 
     95                        <td class="scribe-link-building-external-links-row-url"><?php esc_html_e('Not Available', 'scribeseo'); ?></td> 
     96                        <td class="scribe-link-building-external-links-row-domain-authority"><?php esc_html_e('Not Available', 'scribeseo'); ?></td> 
    9897                        <td> 
    99                             <span class="scribe-link-building-external-links-row-contact-name"><?php _e('Not Available'); ?></span> 
    100                             <span class="scribe-link-building-external-links-row-organization"></span> 
     98                            <span class="scribe-link-building-external-links-row-contact-name"><?php esc_html_e('Not Available', 'scribeseo'); ?></span> 
    10199                        </td> 
    102                         <td class="scribe-link-building-external-links-row-telephone"><?php _e('Not Available'); ?></td> 
    103                         <td class="scribe-link-building-external-links-row-links"><?php _e('Not Available'); ?></td> 
     100                        <td class="scribe-link-building-external-links-row-telephone"><?php esc_html_e('Not Available', 'scribeseo'); ?></td> 
     101                        <td class="scribe-link-building-external-links-row-links"><?php esc_html_e('Not Available', 'scribeseo'); ?></td> 
    104102                    </tr> 
    105103                </tbody> 
  • scribe/trunk/views/backend/meta-boxes/content-analysis.php

    r614019 r642313  
    55                <?php  
    66                if ( empty( $content_analysis ) ) { 
    7                      _e( '-', 'scribeseo' ); 
     7                     esc_html_e( '-', 'scribeseo' ); 
    88                } elseif ( isset( $content_analysis->docScore ) ) { 
    99                    printf( '%d', $content_analysis->docScore ); 
    1010                } else { 
    11                     _e( 'N/A', 'scribeseo' ); 
     11                    esc_html_e( 'N/A', 'scribeseo' ); 
    1212                } 
    1313                ?> 
    1414            </div> 
    15             <h4><?php _e( 'Page Score', 'scribeseo' ); ?></h4> 
     15            <h4><?php esc_html_e( 'Page Score', 'scribeseo' ); ?></h4> 
    1616        </div> 
    1717        <div class="scribe-analysis-meta-box-site-score-container"> 
     
    1919                <?php 
    2020                if ( empty( $content_analysis ) ) { 
    21                      _e( '-', 'scribeseo' ); 
     21                     esc_html_e( '-', 'scribeseo' ); 
    2222                } elseif ( isset( $content_analysis->scribeScore ) ) { 
    2323                    printf( '%d', $content_analysis->scribeScore ); 
    2424                } else { 
    25                     _e( 'N/A', 'scribeseo' ); 
     25                    esc_html_e( 'N/A', 'scribeseo' ); 
    2626                } 
    2727                ?> 
    2828            </div> 
    29             <h4><?php _e( 'Site Score', 'scribeseo' ); ?></h4> 
     29            <h4><?php esc_html_e( 'Site Score', 'scribeseo' ); ?></h4> 
    3030        </div> 
    3131         
     
    3737            <li> 
    3838                <span class="scribe-analysis-dependency-title"> 
    39                     <?php _e('Title Tag Needed'); ?> 
     39                    <?php esc_html_e('Title Tag Needed', 'scribeseo'); ?> 
    4040                </span> 
    4141                <span class="scribe-analysis-dependency-title scribe-ready"> 
    42                     <?php _e('Title Tag Ready'); ?> 
     42                    <?php esc_html_e('Title Tag Ready', 'scribeseo'); ?> 
    4343                </span> 
    4444            </li> 
    4545            <li> 
    4646                <span class="scribe-analysis-dependency-description"> 
    47                     <?php _e('Meta Description Needed'); ?> 
     47                    <?php esc_html_e('Meta Description Needed', 'scribeseo'); ?> 
    4848                </span> 
    4949                <span class="scribe-analysis-dependency-description scribe-ready"> 
    50                     <?php _e('Meta Description Ready'); ?> 
     50                    <?php esc_html_e('Meta Description Ready', 'scribeseo'); ?> 
    5151                </span> 
    5252            </li> 
    5353            <li> 
    5454                <span class="scribe-analysis-dependency-content"> 
    55                     <?php _e('Content'); ?> 
     55                    <?php esc_html_e('Content', 'scribeseo'); ?> 
    5656                </span> 
    5757                <span class="scribe-analysis-dependency-content scribe-ready"> 
    58                     <?php _e('Content Ready'); ?> 
     58                    <?php esc_html_e('Content Ready', 'scribeseo'); ?> 
    5959                </span> 
    6060            </li> 
     
    6363     
    6464    <div class="scribe-analysis-meta-box-statistics misc-pub-section"> 
    65         <?php _e('Evaluations left: '); ?><strong><span class="scribe-analysis-evaluations-remaining"><?php echo number_format_i18n($remaining_evaluations); ?></span> <?php printf(__('as of %s'), date('F j, Y')); ?></strong> 
     65        <?php esc_html_e('Evaluations left: ', 'scribeseo'); ?><strong><span class="scribe-analysis-evaluations-remaining"><?php echo number_format_i18n($remaining_evaluations); ?></span> <?php printf( esc_html__('as of %s', 'scribeseo'), date('F j, Y')); ?></strong> 
    6666    </div> 
    6767     
    6868    <div class="scribe-analysis-meta-box-actions"> 
    6969        <div class="scribe-analysis-meta-box-review-action alignleft"> 
    70             <input title="<?php _e('Content Analysis'); ?>" id="scribe-content-analysis-review-button" type="button" class="button button-secondary thickbox" alt="<?php scribe_the_upload_iframe_src('scribe-analysis-keywords', null, array('scribe-content-analysis-review' => 'true')); ?>" value="<?php _e('Review'); ?>" /> 
     70            <input title="<?php esc_html_e('Content Analysis', 'scribeseo'); ?>" id="scribe-content-analysis-review-button" type="button" class="button button-secondary thickbox" alt="<?php scribe_the_upload_iframe_src('scribe-analysis-keywords', null, array('scribe-content-analysis-review' => 'true')); ?>" value="<?php esc_html_e('Review', 'scribeseo'); ?>" /> 
    7171        </div> 
    7272         
    7373        <div class="scribe-analysis-meta-box-analyze-action alignright"> 
    7474            <img alt="" id="scribe-analysis-is-analyzing" class="ajax-loading" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>"> 
    75             <input id="scribe-content-analysis-analyze-button" type="button" class="button button-primary" value="<?php _e('Analyze'); ?>" /> 
     75            <input id="scribe-content-analysis-analyze-button" type="button" class="button button-primary" value="<?php esc_html_e('Analyze', 'scribeseo'); ?>" /> 
    7676            <?php wp_nonce_field('scribe-analyze-content', 'scribe-analyze-content-nonce'); ?> 
    7777        </div> 
  • scribe/trunk/views/backend/meta-boxes/keyword-research.php

    r614019 r642313  
    22     
    33    <div class="scribe-keyword-research-meta-box-statistics misc-pub-section"> 
    4         <?php _e('Evaluations left: '); ?><strong><span class="scribe-keyword-research-evaluations-remaining"><?php echo number_format_i18n($remaining_evaluations); ?></span> <?php printf(__('as of %s'), date('F j, Y')); ?></strong> 
     4        <?php esc_html_e('Evaluations left: ', 'scribeseo'); ?><strong><span class="scribe-keyword-research-evaluations-remaining"><?php echo number_format_i18n($remaining_evaluations); ?></span> <?php printf( esc_html__('as of %s', 'scribeseo'), date('F j, Y')); ?></strong> 
    55    </div> 
    66     
    77    <div id="scribe-keyword-research-meta-box-input" class="scribe-keyword-research-meta-box-input misc-pub-section"> 
    8         <input class="scribe-default" type="text" id="scribe-keyword-research-term" name="scribe-keyword-research-term" data-default="<?php _e('Enter a keyword'); ?>" value="" tabindex="40003" /> 
    9         <input class="scribe-keyword-research-search-button button button-primary" type="button" tabindex="40004" value="<?php _e('Research'); ?>" /> 
     8        <input class="scribe-default" type="text" id="scribe-keyword-research-term" name="scribe-keyword-research-term" data-default="<?php esc_attr_e('Enter a keyword', 'scribeseo'); ?>" value="" tabindex="40003" /> 
     9        <input class="scribe-keyword-research-search-button button button-primary" type="button" tabindex="40004" value="<?php esc_attr_e('Research', 'scribeseo'); ?>" /> 
    1010         
    1111        <div class="alignright"> 
     
    1515        <input type="hidden" id="scribe-keyword-research-url-placeholder" value="<?php scribe_the_upload_iframe_src('scribe-keyword-suggestions', null, array('scribe-keyword' => 'KEYWORD_PLACEHOLDER')); ?>" /> 
    1616         
    17         <a title="<?php _e('Previous Keyword Research'); ?>" data-previous-count="<?php echo esc_attr( count( $previous_keywords ) ); ?>" href="<?php scribe_the_upload_iframe_src('scribe-keyword-suggestions', null, array('scribe-previous-keywords' => 'true')); ?>" class="scribe-keyword-research-meta-box-previous-keyword-suggestions thickbox"><small><?php _e('Previous Keyword Suggestions'); ?></small></a> 
     17        <a title="<?php esc_attr_e('Previous Keyword Research', 'scribeseo'); ?>" data-previous-count="<?php echo esc_attr( count( $previous_keywords ) ); ?>" href="<?php scribe_the_upload_iframe_src('scribe-keyword-suggestions', null, array('scribe-previous-keywords' => 'true')); ?>" class="scribe-keyword-research-meta-box-previous-keyword-suggestions thickbox"><small><?php esc_html_e('Previous Keyword Suggestions', 'scribeseo'); ?></small></a> 
    1818    </div> 
    1919     
    2020    <div class="scribe-keyword-research-meta-box-target"> 
    21         <h4><?php _e('Target Term'); ?></h4> 
     21        <h4><?php esc_html_e('Target Term', 'scribeseo'); ?></h4> 
    2222        <em class="scribe-keyword-research-meta-box-target-text"><?php echo esc_html( $target_term ); ?></em> 
    23         (<a class="scribe-clear-target-term" href="<?php echo wp_nonce_url(add_query_arg(array('action' => 'scribe_clear_target_term', 'scribe-post-id' => $post->ID), admin_url('admin-ajax.php')), 'scribe-clear-target-term'); ?>"><?php _e('clear'); ?></a>) 
     23        (<a class="scribe-clear-target-term" href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'scribe_clear_target_term', 'scribe-post-id' => (int)$post->ID ), admin_url( 'admin-ajax.php' ) ), 'scribe-clear-target-term' ); ?>"><?php esc_html_e('clear', 'scribeseo'); ?></a>) 
    2424    </div> 
    2525     
  • scribe/trunk/views/backend/meta-boxes/link-building.php

    r614019 r642313  
    44        <li> 
    55            <span class="scribe-link-building-dependency-content-analysis"> 
    6                 <?php _e('Perform Content Analysis on the Content to enable Link Building.'); ?> 
     6                <?php esc_html_e('Perform Content Analysis on the Content to enable Link Building.', 'scribeseo'); ?> 
    77            </span> 
    88            <span class="scribe-link-building-dependency-content-analysis scribe-ready"> 
    9                 <?php _e('Content analyzed. Link building ready.'); ?> 
     9                <?php esc_html_e('Content analyzed. Link building ready.', 'scribeseo'); ?> 
    1010            </span> 
    1111        </li> 
    1212        <li class="scribe-link-building-link-term scribe-info"> 
    13             <strong><?php _e('Link Term'); ?></strong>:  
     13            <strong><?php esc_html_e('Link Term', 'scribeseo'); ?></strong>:  
    1414            <span class="scribe-link-building-link-term-text"> 
    1515                <select name="scribe-link-building-term" id="scribe-link-building-term"> 
    16                     <option value=""><?php _e( '-- Select Term --', 'scribeseo' ); ?></option> 
     16                    <option value=""><?php esc_html_e( '-- Select Term --', 'scribeseo' ); ?></option> 
    1717                    <?php 
    1818                    foreach( (array)$link_terms_array as $term ) { 
     
    2626    </ul> 
    2727    <div class="scribe-link-building-review-button-container alignleft"> 
    28         <input title="<?php _e('Link Building'); ?>" type="button" class="scribe-link-building-review-button button thickbox" alt="<?php scribe_the_upload_iframe_src('scribe-link-building', null, array('scribe-link-building-review' => 1)); ?>" value="<?php _e('Review'); ?>" />    
     28        <input title="<?php esc_html_e('Link Building', 'scribeseo'); ?>" type="button" class="scribe-link-building-review-button button thickbox" alt="<?php scribe_the_upload_iframe_src('scribe-link-building', null, array('scribe-link-building-review' => 1)); ?>" value="<?php esc_html_e('Review', 'scribeseo'); ?>" />  
    2929    </div> 
    3030    <div class="scribe-link-building-research-button-container alignright"> 
     
    3232            <img id="scribe-keyword-research-ajax-feedback" alt="" title="" class="scribe-ajax-feedback" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" style="visibility: hidden;"> 
    3333        </div> 
    34         <input title="<?php _e('Link Building'); ?>" type="button" data-content-analysis-score="<?php echo esc_attr( $content_score ); ?>" class="scribe-content-analysis-score scribe-link-building-research-button button button-primary thickbox" alt="<?php scribe_the_upload_iframe_src('scribe-link-building'); ?>" value="<?php _e('Research'); ?>" /> 
     34        <input title="<?php esc_html_e('Link Building', 'scribeseo'); ?>" type="button" data-content-analysis-score="<?php echo esc_attr( $content_score ); ?>" class="scribe-content-analysis-score scribe-link-building-research-button button button-primary thickbox" alt="<?php scribe_the_upload_iframe_src('scribe-link-building'); ?>" value="<?php esc_html_e('Research', 'scribeseo'); ?>" /> 
    3535    </div> 
    3636    <div class="clear"></div> 
  • scribe/trunk/views/backend/misc/popup-error.php

    r614019 r642313  
    11<div class="scribe-wrap"> 
    2     <p><?php _e('There was an error processing your request. Please try again.'); ?></p> 
     2    <p><?php _e('There was an error processing your request. Please try again.', 'scribeseo'); ?></p> 
    33</div> 
  • scribe/trunk/views/backend/settings/account.php

    r614019 r642313  
    44        <h2> 
    55            <?php  
    6             _e('Scribe - Account Information'); 
     6            _e('Scribe - Account Information', 'scribeseo'); 
    77            $upgrade_url = sprintf( 'mailto:support@copyblogger.com?subject=Upgrade+Request&body=This+is+a+request+to+upgrade+the+account+for+%s.+Please+contact+me+for+upgrade+options.', $settings['api-key'] ); 
    88            ?> 
    9             <a class="button button-secondary" href="<?php echo esc_url( $upgrade_url ); ?>"><?php _e('Upgrade Account'); ?></a> 
     9            <a class="button button-secondary" href="<?php echo esc_url( $upgrade_url ); ?>"><?php _e('Upgrade Account', 'scribeseo'); ?></a> 
    1010        </h2> 
    1111 
     
    1616                <?php if(is_wp_error($account)) { ?> 
    1717     
    18                 <div class="error" id="scribe-account-error"><p><?php printf(__('Your account could not be retrieved. Please ensure that you have set your API key correctly on the <a href="%1$s">settings</a> page.'), add_query_arg(array('page' => 'scribe-settings'), admin_url('options-general.php'))); ?></p></div> 
     18                <div class="error" id="scribe-account-error"><p><?php printf(__('Your account could not be retrieved. Please ensure that you have set your API key correctly on the <a href="%1$s">settings</a> page.', 'scribeseo'), add_query_arg(array('page' => 'scribe-settings'), admin_url('options-general.php'))); ?></p></div> 
    1919                 
    2020                <?php } else { ?> 
     
    2727         
    2828        <div class="bottom-buttons"> 
    29             <a class="button button-secondary" href="<?php echo esc_url( $upgrade_url ); ?>"><?php _e( 'Upgrade Account' ); ?></a> 
     29            <a class="button button-secondary" href="<?php echo esc_url( $upgrade_url ); ?>"><?php _e( 'Upgrade Account' , 'scribeseo'); ?></a> 
    3030        </div> 
    3131         
  • scribe/trunk/views/backend/settings/class-main-settings.php

    r614019 r642313  
    33 
    44    function __construct() { 
    5  
    6         global $premise_base; 
    75 
    86        $settings_field = Scribe_SEO::SETTINGS_KEY; 
     
    4846    function metaboxes() { 
    4947 
    50         add_meta_box( 'scribe-main-settings', __( 'Scribe Settings', 'premise' ), array( $this, 'main_settings_metabox' ), $this->pagehook, 'main' ); 
     48        add_meta_box( 'scribe-main-settings', __( 'Scribe Settings', 'scribeseo'), array( $this, 'main_settings_metabox' ), $this->pagehook, 'main' ); 
    5149 
    5250    } 
     
    5452    function main_settings_metabox() { 
    5553        $dependencies = Scribe_SEO::get_available_dependencies(); 
    56         $errors = get_settings_errors(); 
    5754 
    5855    ?> 
     
    6158        <tr valign="top"> 
    6259            <th scope="row"> 
    63                 <label for="scribe-api-key"><?php _e( 'API Key', 'scribeseo' ); ?></label> 
    64                 <a class="scribe-help-marker" rel="popover" title="<?php _e( 'API Key', 'scribeseo' ); ?>" data-content="<?php _e( 'Enter your API key for Scribe SEO. You will find your API key by logging in to https://my.scribeseo.com. Be sure to include the scribe- at the beginning of the key and that you do not have an extra space at the end after pasting it in the box. If you require an API key, go to https://purchase.scribeseo.com.', 'scribeseo' ); ?>" href="#">?</a> 
     60                <label for="scribe-api-key"><?php esc_html_e( 'API Key', 'scribeseo' ); ?></label> 
     61                <a class="scribe-help-marker" rel="popover" title="<?php esc_html_e( 'API Key', 'scribeseo' ); ?>" data-content="<?php esc_attr_e( 'Enter your API key for Scribe SEO. You will find your API key by logging in to https://my.scribeseo.com. Be sure to include the scribe- at the beginning of the key and that you do not have an extra space at the end after pasting it in the box. If you require an API key, go to https://purchase.scribeseo.com.', 'scribeseo' ); ?>" href="#">?</a> 
    6562            </th> 
    6663            <td> 
     
    7067        <tr valign="top"> 
    7168            <th scope="row"> 
    72                 <label for="scribe-seo-tool"><?php _e( 'SEO Tool', 'scribeseo' ); ?></label> 
    73                 <a class="scribe-help-marker" rel="popover" title="<?php _e( 'SEO Tool', 'scribeseo' ); ?>" data-content="<?php _e( 'Use the drop down box to select the compatible SEO theme, framework or plugin you are using to set the title and meta description for your posts. See http://scribeseo.com/compatibility for a complete list of supported SEO themes and plugins.', 'scribeseo' ); ?>" href="#">?</a> 
     69                <label for="scribe-seo-tool"><?php esc_html_e( 'SEO Tool', 'scribeseo' ); ?></label> 
     70                <a class="scribe-help-marker" rel="popover" title="<?php esc_html_e( 'SEO Tool', 'scribeseo' ); ?>" data-content="<?php esc_attr_e( 'Use the drop down box to select the compatible SEO theme, framework or plugin you are using to set the title and meta description for your posts. See http://scribeseo.com/compatibility for a complete list of supported SEO themes and plugins.', 'scribeseo' ); ?>" href="#">?</a> 
    7471            </th> 
    7572            <td> 
     
    7774            $hiddens = array(); 
    7875            if ( is_wp_error( $dependencies ) ) { 
    79                 printf( __( 'The list of available dependencies could not be retrieved. Please check the <a href="%1$s">compatibility page</a> and submit a support ticket.', 'scribeseo' ), add_query_arg( array( 'page' => 'scribe-compatibility' ), admin_url( 'admin.php' ) ) ); 
     76                printf( esc_html__( 'The list of available dependencies could not be retrieved. Please check the %1$s and submit a support ticket.', 'scribeseo' ), '<a href="' . add_query_arg( array( 'page' => 'scribe-compatibility' ), admin_url( 'admin.php' ) ) . '">' . esc_html__( 'compatibility page', 'scribeseo' ) . '</a>' ); 
    8077            } else { 
    8178                $cumulative_count = count( $dependencies->plugins ) + count( $dependencies->themes ); 
     
    9895?> 
    9996                <br /> 
    100                 <small><em><?php _e( 'This tool was automatically chosen because it is the only supported tool you currently have activated.', 'scribeseo' ); ?></em></small> 
     97                <small><em><?php esc_html_e( 'This tool was automatically chosen because it is the only supported tool you currently have activated.', 'scribeseo' ); ?></em></small> 
    10198<?php  
    10299                } else { 
    103100?> 
    104101                <select class="scribe-select" name="<?php echo $this->get_field_name( 'seo-tool' ); ?>" id="<?php echo $this->get_field_id( 'seo-tool' ); ?>"> 
    105                     <option value=""><?php _e( '-- Select One --', 'scribeseo' ); ?></option> 
     102                    <option value=""><?php esc_html_e( '-- Select One --', 'scribeseo' ); ?></option> 
    106103                    <?php if ( ! empty( $dependencies->plugins ) ) { ?> 
    107                     <optgroup label="<?php _e( 'Plugins', 'scribeseo' ); ?>"> 
     104                    <optgroup label="<?php esc_html_e( 'Plugins', 'scribeseo' ); ?>"> 
    108105<?php  
    109106                        foreach( $dependencies->plugins as $plugin_dependency ) { 
     
    117114                     
    118115                    if(!empty($dependencies->themes)) { ?> 
    119                     <optgroup label="<?php _e( 'Themes', 'scribeseo' ); ?>"> 
     116                    <optgroup label="<?php esc_html_e( 'Themes', 'scribeseo' ); ?>"> 
    120117<?php 
    121118                        foreach( $dependencies->themes as $theme_dependency ) { 
     
    137134        <tr valign="top"> 
    138135            <th scope="row"> 
    139                 <label for="scribe-your-url"><?php _e( 'Your URL', 'scribeseo' ); ?></label> 
    140                 <a class="scribe-help-marker" rel="popover" title="<?php _e( 'Your URL', 'scribeseo' ); ?>" data-content="<?php _e( 'By default, the URL of your site is entered (and required). If your current WordPress site is not public, please enter a URL that is on the web.', 'scribeseo' ); ?>" href="#">?</a> 
     136                <label for="scribe-your-url"><?php esc_html_e( 'Your URL', 'scribeseo' ); ?></label> 
     137                <a class="scribe-help-marker" rel="popover" title="<?php esc_attr_e( 'Your URL', 'scribeseo' ); ?>" data-content="<?php esc_attr_e( 'By default, the URL of your site is entered (and required). If your current WordPress site is not public, please enter a URL that is on the web.', 'scribeseo' ); ?>" href="#">?</a> 
    141138            </th> 
    142139            <td> 
     
    146143        <tr valign="top"> 
    147144            <th scope="row"> 
    148                 <label for="scribe-security-method"><?php _e( 'Security Method', 'scribeseo' ); ?></label> 
    149                 <a class="scribe-help-marker" rel="popover" title="<?php _e( 'Security Method', 'scribeseo' ); ?>" data-content='<?php _e( ' By default, all communications with our servers are not encrypted. This means that we are not using SSL to hide your information on the web. For some, this may be acceptable. Other users may not want this. If you require SSL connections, then enable "Enhanced SSL" as described below. Otherwise, leave it at "Basic Non-SSL.”', 'scribeseo' ); ?>' href="#">?</a> 
     145                <label for="scribe-security-method"><?php esc_html_e( 'Security Method', 'scribeseo' ); ?></label> 
     146                <a class="scribe-help-marker" rel="popover" title="<?php esc_attr_e( 'Security Method', 'scribeseo' ); ?>" data-content='<?php esc_attr_e( ' By default, all communications with our servers are not encrypted. This means that we are not using SSL to hide your information on the web. For some, this may be acceptable. Other users may not want this. If you require SSL connections, then enable "Enhanced SSL" as described below. Otherwise, leave it at "Basic Non-SSL.”', 'scribeseo' ); ?>' href="#">?</a> 
    150147            </th> 
    151148            <td> 
    152149                <select class="scribe-select" name="<?php echo $this->get_field_name( 'security-method' ); ?>" id="<?php echo $this->get_field_id( 'security-method' ); ?>"> 
    153                     <option <?php selected(false,$this->get_field_value( 'security-method' ) ); ?> value="0"><?php _e('Basic Non-SSL') ?></option> 
    154                     <option <?php selected(true, $this->get_field_value( 'security-method' ) ); ?> value="1"><?php _e('Enhanced SSL'); ?></option> 
     150                    <option <?php selected(false,$this->get_field_value( 'security-method' ) ); ?> value="0"><?php esc_html_e('Basic Non-SSL', 'scribeseo') ?></option> 
     151                    <option <?php selected(true, $this->get_field_value( 'security-method' ) ); ?> value="1"><?php esc_html_e('Enhanced SSL', 'scribeseo'); ?></option> 
    155152                </select> 
    156153            </td> 
     
    158155        <tr valign="top"> 
    159156            <th scope="row"> 
    160                 <label for="scribe-permissions-level"><?php _e( 'Permissions', 'scribeseo' ); ?></label> 
     157                <label for="scribe-permissions-level"><?php esc_html_e( 'Permissions', 'scribeseo' ); ?></label> 
    161158                <a class="scribe-help-marker" rel="popover" title="<?php _e( 'Permissions', 'scribeseo' ); ?>" data-content="<?php _e( 'Scribe enables you to control which user roles have access to Scribe. Click the drop down box to restrict Permissions to Administrators, Editors, Authors, or Contributors or higher. Set the lowest Role within WordPress that is available to use Scribe.', 'scribeseo' ); ?>" href="#">?</a> 
    162159            </th> 
    163160            <td> 
    164161                <select class="scribe-select" name="<?php echo $this->get_field_name( 'permissions-level' ); ?>" id="<?php echo $this->get_field_id( 'permissions-level' ); ?>"> 
    165                     <option <?php selected('manage_options', $this->get_field_value( 'permissions-level' ) ); ?> value="manage_options"><?php _e('Administrator'); ?></option> 
    166                         <option <?php selected('delete_others_posts', $this->get_field_value( 'permissions-level' ) ); ?> value="delete_others_posts"><?php _e('Editor'); ?></option> 
    167                         <option <?php selected('delete_published_posts', $this->get_field_value( 'permissions-level' ) ); ?> value="delete_published_posts"><?php _e('Author'); ?></option> 
    168                         <option <?php selected('edit_posts', $this->get_field_value( 'permissions-level' ) ); ?> value="edit_posts"><?php _e('Contributor'); ?></option> 
     162                    <option <?php selected('manage_options', $this->get_field_value( 'permissions-level' ) ); ?> value="manage_options"><?php esc_html_e('Administrator', 'scribeseo'); ?></option> 
     163                        <option <?php selected('delete_others_posts', $this->get_field_value( 'permissions-level' ) ); ?> value="delete_others_posts"><?php esc_html_e('Editor', 'scribeseo'); ?></option> 
     164                        <option <?php selected('delete_published_posts', $this->get_field_value( 'permissions-level' ) ); ?> value="delete_published_posts"><?php esc_html_e('Author', 'scribeseo'); ?></option> 
     165                        <option <?php selected('edit_posts', $this->get_field_value( 'permissions-level' ) ); ?> value="edit_posts"><?php esc_html_e('Contributor', 'scribeseo'); ?></option> 
    169166                </select> 
    170167            </td> 
     
    173170            <th scope="row"> 
    174171                <?php _e( 'Post Types', 'scribeseo' ); ?> 
    175                 <a class="scribe-help-marker" rel="popover" title="<?php _e( 'Post Types', 'scribeseo' ); ?>" data-content="<?php _e( 'By default, Posts and Pages in WordPress can use Scribe. If you have other Custom Post types, please select them for use with Scribe. Add a check mark next to each type of post that you want to be able to run Scribe SEO. No check mark indicates that Scribe will not be availble when editing the respective post type.', 'scribeseo' ); ?>" href="#">?</a> 
     172                <a class="scribe-help-marker" rel="popover" title="<?php esc_html_e( 'Post Types', 'scribeseo' ); ?>" data-content="<?php esc_attr_e( 'By default, Posts and Pages in WordPress can use Scribe. If you have other Custom Post types, please select them for use with Scribe. Add a check mark next to each type of post that you want to be able to run Scribe SEO. No check mark indicates that Scribe will not be availble when editing the respective post type.', 'scribeseo' ); ?>" href="#">?</a> 
    176173            </th> 
    177174            <td> 
     
    208205 
    209206        if ( ! $scribe_api_key_status ) 
    210             add_settings_error( '', 'scribe-api-key-invalid', __( 'Your API key may not be valid. Please verify you have entered the correct key.' ), 'error' ); 
     207            add_settings_error( '', 'scribe-api-key-invalid', __( 'Your API key may not be valid. Please verify you have entered the correct key.' , 'scribeseo'), 'error' ); 
    211208        elseif ( ! empty( $newvalue['seo-tool'] ) && empty( $newvalue['your-url'] ) ) 
    212209            add_settings_error( '', 'scribe-url-invalid', __( 'Scribe requires Your URL to function properly.', 'scribeseo' ), 'error' ); 
     
    219216    function premise_notice( $page_hook ) { 
    220217 
    221         if ( $page_hook != $this->pagehook || get_option( 'premise_dismiss_gwo' ) ) 
     218        if ( $page_hook != $this->pagehook || get_option( Scribe_SEO::SHOW_PREMISE_NAG_KEY ) ) 
    222219            return; 
    223220 
     
    226223        <?php 
    227224 
    228         if ( isset( $_GET['dismiss'] ) && $_GET['dismiss'] == 'gwo' ) { 
    229  
    230             update_option( 'premise_dismiss_gwo', '1' ); 
     225        if ( isset( $_GET['scribe-dismiss-premise-nag'] ) && $_GET['scribe-dismiss-premise-nag'] == '1' ) { 
     226 
     227            update_option( Scribe_SEO::SHOW_PREMISE_NAG_KEY, '1' ); 
    231228            return; 
    232229 
    233230        } 
    234231 
     232        $dismiss_nag_url = add_query_arg( array( 'scribe-dismiss-premise-nag' => 1 ), menu_page_url( Scribe_SEO::SETTINGS_TOP_PAGE_SLUG ) ); 
    235233        ?> 
    236234            <div id="scribe-premise-nav" class="updated settings-error"> 
    237235                <p> 
    238                     <?php _e( 'Have you tried our landing page software? Premise is the perfect companion to Scribe, helping you creating optimized landing pages directly in WordPress. <a target="_blank" href="http://getpremise.com">Click here to learn more</a>.', 'scribeseo' ); ?><br /> 
     236                    <?php esc_html_e( 'Have you tried our landing page software? Premise is the perfect companion to Scribe, helping you creating optimized landing pages directly in WordPress.', 'scribeseo' ); ?> <a target="_blank" href="http://getpremise.com"><?php esc_html_e( 'Click here to learn more.', 'scribeseo' ); ?></a><br /> 
    239237                </p> 
    240                 <p class="alignright"><a href="<?php echo esc_url( $dismiss_nag_url ); ?>"><?php _e( 'Dismiss', 'scribeseo' ); ?></a></p> 
     238                <p class="alignright"><a href="<?php echo esc_url( $dismiss_nag_url ); ?>"><?php esc_html_e( 'Dismiss', 'scribeseo' ); ?></a></p> 
    241239                <div class="clear"></div> 
    242240            </div> 
  • scribe/trunk/views/backend/settings/compatibility.php

    r614019 r642313  
    55        <?php screen_icon(); ?> 
    66        <h2> 
    7             <?php _e('Scribe v4 Compatibility Report'); ?> 
    8             <input type="submit" class="button button-primary" name="send-scribe-compatibility-report" value="<?php _e('Send Report'); ?>" /> 
     7            <?php esc_html_e('Scribe v4 Compatibility Report', 'scribeseo'); ?> 
     8            <input type="submit" class="button button-primary" name="send-scribe-compatibility-report" value="<?php esc_attr_e('Send Report', 'scribeseo'); ?>" /> 
    99        </h2> 
    1010 
     
    1818         
    1919        <div class="bottom-buttons"> 
    20             <input type="submit" class="button button-primary" name="send-scribe-compatibility-report" value="<?php _e('Send Report'); ?>" /> 
     20            <input type="submit" class="button button-primary" name="send-scribe-compatibility-report" value="<?php esc_attr_e('Send Report', 'scribeseo'); ?>" /> 
    2121        </div> 
    2222         
  • scribe/trunk/views/backend/settings/news.php

    r614019 r642313  
    22    <?php screen_icon(); ?> 
    33    <h2 id="scribe-seo-news-headline"> 
    4         <?php _e('Scribe - SEO News - Brought to you by <a href="http://www.searchenginejournal.com">Search Engine Journal</a>'); ?> 
     4        <?php echo wp_kses( __('Scribe - SEO News - Brought to you by <a href="http://www.searchenginejournal.com">Search Engine Journal</a>', 'scribeseo'), Scribe_SEO::formatting_allowedtags() ); ?> 
    55    </h2> 
    66     
     
    1212        ?> 
    1313    <div class="scribe-seo-news-item"> 
    14         <h3><a href="<?php echo esc_attr( $item->get_link() ); ?>"><?php echo esc_html( $item->get_title() ); ?></a></h3> 
     14        <h3><a href="<?php echo esc_url( $item->get_link() ); ?>"><?php echo esc_html( $item->get_title() ); ?></a></h3> 
    1515        <p><?php printf('<span class="scribe-seo-news-item-date">%s</span> %s', $item->get_date(get_option('date_format')), $creator_string ); ?></p> 
    1616        <?php echo $content_formatted; ?> 
Note: See TracChangeset for help on using the changeset viewer.