Changeset 2722201

Timestamp:

05/11/2022 06:35:24 PM (4 years ago)

Author:

mmuro

Message:

More changes

Location:

visual-form-builder/trunk

Files:

• admin/class-admin-menu.php (modified) (2 diffs)
• admin/class-entries-detail.php (modified) (1 diff)
• admin/class-entries-list.php (modified) (4 diffs)
• admin/class-forms-list.php (modified) (3 diffs)
• inc/class-list-table.php (deleted)
• visual-form-builder.php (modified) (1 diff)

visual-form-builder/trunk/admin/class-admin-menu.php

@@ -147 +147 @@
       if ( isset( $_POST['s'] ) && !empty( $_POST['s'] ) )
         echo '<span class="subtitle">' . sprintf( __( 'Search results for "%s"' , 'visual-form-builder'), esc_html( $_POST['s'] ) );
-
-      $form_nav_selected_id = isset( $_GET['form'] ) ? $_GET['form'] : '0';
     ?>
     </h1>
@@ -257 +255 @@
     </h1>
     <?php
-    if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'view', 'edit', 'update_entry' ) ) ) :
+    if ( isset( $_GET['vfb-action'] ) && in_array( $_GET['vfb-action'], array( 'view', 'edit', 'update_entry' ) ) ) :
       $entries_detail->entries_detail();
     else :

visual-form-builder/trunk/admin/class-entries-detail.php

@@ -31 +31 @@
 ?>
       <form id="entry-edit" method="post" action="">
-      <h3><span><?php echo stripslashes( $entry->form_title ); ?> : <?php _e( 'Entry' , 'visual-form-builder'); ?> # <?php echo $entry->entries_id; ?></span></h3>
+      <h3><span><?php echo esc_html( $entry->form_title ); ?> : <?php _e( 'Entry' , 'visual-form-builder'); ?> # <?php echo absint( $entry->entries_id ); ?></span></h3>
             <div id="vfb-poststuff" class="metabox-holder has-right-sidebar">
         <div id="side-info-column" class="inner-sidebar">

visual-form-builder/trunk/admin/class-entries-list.php

@@ -5 +5 @@
  * @since 1.2
  */
-class Visual_Form_Builder_Entries_List extends Visual_Form_Builder_List_Table {
+class Visual_Form_Builder_Entries_List extends WP_List_Table {
   /**
    * [__construct description]
@@ -302 +302 @@
     if ( isset( $_POST['entry'] ) ) {
       if ( is_array( $_POST['entry'] ) ) {
-        $entry_id = array_map( 'esc_html', $_POST['entry'] );
+        $entry_id = array_map( 'sanitize_text_field', $_POST['entry'] );
       } else {
-        $entry_id = array_map( 'esc_html', (array) $_POST['entry'] );
+        $entry_id = array_map( 'sanitize_text_field', (array) $_POST['entry'] );
       }
     }
@@ -355 +355 @@
       return;
 
-    $action  = esc_html( $_GET['vfb-action'] );
+    $action  = sanitize_text_field( $_GET['vfb-action'] );
     $entry_id = absint( $_GET['entry'] );
 
@@ -603 +603 @@
     ) );
   }
-
-  /**
-   * Display the pagination.
-   * Customize default function to work with months and form drop down filters
-   *
-   * @since 3.1.0
-   * @access protected
-   */
-  function pagination( $which ) {
-    if ( empty( $this->_pagination_args ) )
-      return;
-
-    extract( $this->_pagination_args, EXTR_SKIP );
-
-    $output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
-
-    $current              = $this->get_pagenum();
-    $removable_query_args = wp_removable_query_args();
-
-    $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-
-    $current_url = remove_query_arg( $removable_query_args, $current_url );
-
-    $page_links = array();
-
-    // Added to pick up the months dropdown
-    $m = isset( $_POST['m'] ) ? (int) $_POST['m'] : 0;
-
-    $disable_first = $disable_last = '';
-    if ( $current == 1 )
-      $disable_first = ' disabled';
-    if ( $current == $total_pages )
-      $disable_last = ' disabled';
-
-    $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-      'first-page' . $disable_first,
-      esc_attr__( 'Go to the first page' ),
-      esc_url( remove_query_arg( 'paged', $current_url ) ),
-      '&laquo;'
-    );
-
-    // Modified the add_query_args to include my custom dropdowns
-    $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-      'prev-page' . $disable_first,
-      esc_attr__( 'Go to the previous page' ),
-      esc_url( add_query_arg( array( 'paged' => max( 1, $current-1 ), 'm' => $m, 'form-filter' => $this->current_filter_action() ), $current_url ) ),
-      '&lsaquo;'
-    );
-
-    if ( 'bottom' == $which )
-      $html_current_page = $current;
-    else
-      $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
-        esc_attr__( 'Current page' ),
-        $current,
-        strlen( $total_pages )
-      );
-
-    $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-    $page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>';
-
-    $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-      'next-page' . $disable_last,
-      esc_attr__( 'Go to the next page' ),
-      esc_url( add_query_arg( array( 'paged' => min( $total_pages, $current+1 ), 'm' => $m, 'form-filter' => $this->current_filter_action() ), $current_url ) ),
-      '&rsaquo;'
-    );
-
-    // Modified the add_query_args to include my custom dropdowns
-    $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-      'last-page' . $disable_last,
-      esc_attr__( 'Go to the last page' ),
-      esc_url( add_query_arg( array( 'paged' => $total_pages, 'm' => $m, 'form-filter' => $this->current_filter_action() ), $current_url ) ),
-      '&raquo;'
-    );
-
-    $pagination_links_class = 'pagination-links';
-    if ( ! empty( $infinite_scroll ) )
-      $pagination_links_class = ' hide-if-js';
-    $output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
-
-    if ( $total_pages )
-      $page_class = $total_pages < 2 ? ' one-page' : '';
-    else
-      $page_class = ' no-pages';
-
-    $this->_pagination = "<div class='tablenav-pages{$page_class}'>$output</div>";
-
-    echo $this->_pagination;
-  }
 }

visual-form-builder/trunk/admin/class-forms-list.php

@@ -5 +5 @@
  * @since 1.2
  */
-class Visual_Form_Builder_Forms_List extends Visual_Form_Builder_List_Table {
+class Visual_Form_Builder_Forms_List extends WP_List_Table {
   /**
    * errors
@@ -412 +412 @@
 
     // Set our ORDER BY and ASC/DESC to sort the entries
-    $orderby  = ( !empty( $_GET['orderby'] ) ) ? $_GET['orderby'] : 'form_id';
-    $order    = ( !empty( $_GET['order'] ) ) ? $_GET['order'] : 'desc';
+    $orderby  = !empty( $_GET['orderby'] )  ? sanitize_text_field( $_GET['orderby'] ) : 'form_id';
+    $order    = !empty( $_GET['order'] )  ? sanitize_text_field( $_GET['order'] ) : 'desc';
 
     // Get the sorted entries
@@ -459 +459 @@
     ) );
   }
-
-  /**
-   * Display the pagination.
-   * Customize default function to work with months and form drop down filters
-   *
-   * @since 3.1.0
-   * @access protected
-   */
-  function pagination( $which ) {
-
-    if ( empty( $this->_pagination_args ) )
-      return;
-
-    extract( $this->_pagination_args, EXTR_SKIP );
-
-    $output = '<span class="displaying-num">' . sprintf( _n( '1 form', '%s forms', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
-
-    $current              = $this->get_pagenum();
-    $removable_query_args = wp_removable_query_args();
-
-    $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-
-    $current_url = remove_query_arg( $removable_query_args, $current_url );
-
-    $page_links = array();
-
-    // Added to pick up the months dropdown
-    $m = isset( $_POST['m'] ) ? (int) $_POST['m'] : 0;
-
-    $disable_first = $disable_last = '';
-    if ( $current == 1 )
-      $disable_first = ' disabled';
-    if ( $current == $total_pages )
-      $disable_last = ' disabled';
-
-    $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-      'first-page' . $disable_first,
-      esc_attr__( 'Go to the first page' ),
-      esc_url( remove_query_arg( 'paged', $current_url ) ),
-      '&laquo;'
-    );
-
-    // Modified the add_query_args to include my custom dropdowns
-    $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-      'prev-page' . $disable_first,
-      esc_attr__( 'Go to the previous page' ),
-      esc_url( add_query_arg( array( 'paged' => max( 1, $current-1 ), 'm' => $m, 'form-filter' => $this->current_filter_action() ), $current_url ) ),
-      '&lsaquo;'
-    );
-
-    if ( 'bottom' == $which )
-      $html_current_page = $current;
-    else
-      $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='paged' value='%s' size='%d' />",
-        esc_attr__( 'Current page' ),
-        $current,
-        strlen( $total_pages )
-      );
-
-    $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-    $page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>';
-
-    $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-      'next-page' . $disable_last,
-      esc_attr__( 'Go to the next page' ),
-      esc_url( add_query_arg( array( 'paged' => min( $total_pages, $current+1 ), 'm' => $m, 'form-filter' => $this->current_filter_action() ), $current_url ) ),
-      '&rsaquo;'
-    );
-
-    // Modified the add_query_args to include my custom dropdowns
-    $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-      'last-page' . $disable_last,
-      esc_attr__( 'Go to the last page' ),
-      esc_url( add_query_arg( array( 'paged' => $total_pages, 'm' => $m, 'form-filter' => $this->current_filter_action() ), $current_url ) ),
-      '&raquo;'
-    );
-
-    $pagination_links_class = 'pagination-links';
-    if ( ! empty( $infinite_scroll ) )
-      $pagination_links_class = ' hide-if-js';
-    $output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
-
-    if ( $total_pages )
-      $page_class = $total_pages < 2 ? ' one-page' : '';
-    else
-      $page_class = ' no-pages';
-
-    $this->_pagination = "<div class='tablenav-pages{$page_class}'>$output</div>";
-
-    echo $this->_pagination;
-  }
 }

visual-form-builder/trunk/visual-form-builder.php

@@ -150 +150 @@
     require_once( VFB_WP_PLUGIN_DIR . 'inc/class-uninstall.php' );
     require_once( VFB_WP_PLUGIN_DIR . 'inc/class-i18n.php' );
-    require_once( VFB_WP_PLUGIN_DIR . 'inc/class-list-table.php' );
+    if ( !class_exists( 'WP_List_Table' ) ) {
+      require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+    }
     require_once( VFB_WP_PLUGIN_DIR . 'admin/class-admin-menu.php' );
     require_once( VFB_WP_PLUGIN_DIR . 'admin/class-admin-notices.php' );