Changeset 11204 for trunk/wp-admin/import/livejournal.php

Timestamp:

05/05/2009 07:43:53 PM (16 years ago)

Author:

markjaquith

Message:

_a(), _ea(), _xa(), attr() are now esc_attr(), esc_attr_e(), esc_attr_x(), esc_attr() -- still short, but less cryptic. see #9650

File:

• trunk/wp-admin/import/livejournal.php (modified) (7 diffs)

trunk/wp-admin/import/livejournal.php

@@ -182 +182 @@
         <?php wp_nonce_field( 'lj-api-import' ) ?>
         <?php if ( get_option( 'ljapi_username' ) && get_option( 'ljapi_password' ) ) : ?>
-            <input type="hidden" name="step" value="<?php echo attr( get_option( 'ljapi_step' ) ) ?>" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( get_option( 'ljapi_step' ) ) ?>" />
             <p><?php _e( 'It looks like you attempted to import your LiveJournal posts previously and got interrupted.' ) ?></p>
             <p class="submit">
-                <input type="submit" class="button-primary" value="<?php _ea( 'Continue previous import' ) ?>" />
+                <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Continue previous import' ) ?>" />
             </p>
-            <p class="submitbox"><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&amp;step=-1&amp;_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&amp;_wp_http_referer=' . attr( $_SERVER['REQUEST_URI'] )) ?>" class="deletion submitdelete"><?php _e( 'Cancel &amp; start a new import' ) ?></a></p>
+            <p class="submitbox"><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&amp;step=-1&amp;_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&amp;_wp_http_referer=' . esc_attr( $_SERVER['REQUEST_URI'] )) ?>" class="deletion submitdelete"><?php _e( 'Cancel &amp; start a new import' ) ?></a></p>
             <p>
         <?php else : ?>
@@ -224 +224 @@
 
             <p class="submit">
-                <input type="submit" class="button-primary" value="<?php _ea( 'Connect to LiveJournal and Import' ) ?>" />
+                <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Connect to LiveJournal and Import' ) ?>" />
             </p>
 
@@ -725 +725 @@
             ?>
             <p><?php _e( 'Please enter your LiveJournal username <em>and</em> password so we can download your posts and comments.' ) ?></p>
-            <p><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&amp;step=-1&amp;_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&amp;_wp_http_referer=' . attr( str_replace( '&step=1', '', $_SERVER['REQUEST_URI'] ) ) ) ?>"><?php _e( 'Start again' ) ?></a></p>
+            <p><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&amp;step=-1&amp;_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&amp;_wp_http_referer=' . esc_attr( str_replace( '&step=1', '', $_SERVER['REQUEST_URI'] ) ) ) ?>"><?php _e( 'Start again' ) ?></a></p>
             <?php
             return false;
@@ -737 +737 @@
                 ?>
                 <p><?php _e( 'Logging in to LiveJournal failed. Check your username and password and try again.' ) ?></p>
-                <p><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&amp;step=-1&amp;_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&amp;_wp_http_referer=' . attr( str_replace( '&step=1', '', $_SERVER['REQUEST_URI'] ) ) ) ?>"><?php _e( 'Start again' ) ?></a></p>
+                <p><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&amp;step=-1&amp;_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&amp;_wp_http_referer=' . esc_attr( str_replace( '&step=1', '', $_SERVER['REQUEST_URI'] ) ) ) ?>"><?php _e( 'Start again' ) ?></a></p>
                 <?php
                 return false;
@@ -817 +817 @@
             <?php wp_nonce_field( 'lj-api-import' ) ?>
             <input type="hidden" name="step" id="step" value="1" />
-            <p><input type="submit" class="button-primary" value="<?php _ea( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
+            <p><input type="submit" class="button-primary" value="<?php esc_attr_e( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
             </form>
             <?php $this->auto_ajax( 'ljapi-auto-repost', 'auto-message', 0 ); ?>
@@ -867 +867 @@
             <?php wp_nonce_field( 'lj-api-import' ) ?>
             <input type="hidden" name="step" id="step" value="2" />
-            <p><input type="submit" class="button-primary" value="<?php _ea( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
+            <p><input type="submit" class="button-primary" value="<?php esc_attr_e( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
             </form>
             <?php $this->auto_ajax( 'ljapi-auto-repost', 'auto-message', 0 ); ?>
@@ -942 +942 @@
         $str .= wp_nonce_field( 'lj-api-import', '_wpnonce', true, false );
         $str .= wp_referer_field( false );
-        $str .= '<input type="hidden" name="step" id="step" value="' . attr($next_step) . '" />';
-        $str .= '<p><input type="submit" class="button-primary" value="' . attr( $label ) . '" /> <span id="auto-message"></span></p>';
+        $str .= '<input type="hidden" name="step" id="step" value="' . esc_attr($next_step) . '" />';
+        $str .= '<p><input type="submit" class="button-primary" value="' . esc_attr( $label ) . '" /> <span id="auto-message"></span></p>';
         $str .= '</form>';