Skip to content

Scrutinizer Auto-Fixes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephywells merged 1 commit into from
Mar 12, 2015
Merged

Scrutinizer Auto-Fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/controllers/FrmAppController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ public static function localize_script($location) {
'nonce' => wp_create_nonce( 'frm_ajax' ),
'no_save_warning' => __( 'Warning: There is no way to retrieve unsaved entries.', 'formidable' ),
'jquery_ui_url' => FrmAppHelper::jquery_ui_base_url(),
));
) );
}
}

Expand Down
118 changes: 59 additions & 59 deletions classes/controllers/FrmFormsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,28 +179,28 @@ public static function update( $values = false ) {
$values = FrmProEntry::mod_other_vals( $values, 'back' );
}

$errors = FrmForm::validate($values);
$permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce');
$errors = FrmForm::validate( $values );
$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
if ( $permission_error !== false ) {
$errors['form'] = $permission_error;
}

$id = isset($values['id']) ? (int) $values['id'] : (int) FrmAppHelper::get_param('id');
$id = isset( $values['id'] ) ? (int) $values['id'] : (int) FrmAppHelper::get_param( 'id' );

if ( count( $errors ) > 0 ) {
return self::get_edit_vars($id, $errors);
return self::get_edit_vars( $id, $errors );
} else {
FrmForm::update( $id, $values );
$message = __( 'Form was Successfully Updated', 'formidable' );
if ( defined('DOING_AJAX') ) {
die($message);
if ( defined( 'DOING_AJAX' ) ) {
die( $message );
}
return self::get_edit_vars($id, '', $message);
return self::get_edit_vars( $id, '', $message );
}
}

public static function bulk_create_template($ids) {
FrmAppHelper::permission_check('frm_edit_forms');
public static function bulk_create_template( $ids ) {
FrmAppHelper::permission_check( 'frm_edit_forms' );

foreach ( $ids as $id ) {
FrmForm::duplicate( $id, true, true );
Expand Down Expand Up @@ -247,22 +247,22 @@ public static function page_preview() {
return;
}

$form = FrmForm::getOne($params['form']);
$form = FrmForm::getOne( $params['form'] );
if ( ! $form ) {
return;
}
return self::show_form($form->id, '', true, true);
return self::show_form( $form->id, '', true, true );
}

public static function preview() {
do_action('frm_wp');
do_action( 'frm_wp' );

global $frm_vars;
$frm_vars['preview'] = true;

if ( !defined( 'ABSPATH' ) && !defined( 'XMLRPC_REQUEST' )) {
if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
global $wp;
$root = dirname(dirname(dirname(dirname(__FILE__))));
$root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
include_once( $root.'/wp-config.php' );
$wp->init();
$wp->register_globals();
Expand Down Expand Up @@ -456,15 +456,15 @@ public static function get_shortcode_opts() {
}

public static function display_forms_list( $params = array(), $message = '', $current_page_ov = false, $errors = array() ) {
FrmAppHelper::permission_check('frm_view_forms');
FrmAppHelper::permission_check( 'frm_view_forms' );

global $wpdb, $frm_vars;

if ( empty( $params ) ) {
$params = FrmFormsHelper::get_params();
}

$wp_list_table = new FrmFormsListHelper( compact('params') );
$wp_list_table = new FrmFormsListHelper( compact( 'params' ) );

$pagenum = $wp_list_table->get_pagenum();

Expand Down Expand Up @@ -498,7 +498,7 @@ public static function get_columns($columns) {

$columns['created_at'] = __( 'Date', 'formidable' );

add_screen_option( 'per_page', array( 'label' => __( 'Forms', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_per_page') );
add_screen_option( 'per_page', array( 'label' => __( 'Forms', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_per_page' ) );

return $columns;
}
Expand All @@ -513,7 +513,7 @@ public static function get_sortable_columns() {
);
}

public static function hidden_columns($result) {
public static function hidden_columns( $result ) {
$return = false;
foreach ( (array) $result as $r ) {
if ( ! empty( $r ) ) {
Expand All @@ -537,7 +537,7 @@ public static function hidden_columns($result) {
return $result;
}

public static function save_per_page($save, $option, $value) {
public static function save_per_page( $save, $option, $value ) {
if ( $option == 'formidable_page_formidable_per_page' ) {
$save = (int) $value;
}
Expand Down Expand Up @@ -652,81 +652,81 @@ public static function get_email_html() {
}

public static function filter_content( $content, $form, $entry = false ) {
if ( ! $entry || ! is_object($entry) ) {
if ( ! $entry || ! is_numeric($entry) ) {
$entry = ( $_POST && isset($_POST['id']) ) ? $_POST['id'] : false;
if ( ! $entry || ! is_object( $entry ) ) {
if ( ! $entry || ! is_numeric( $entry ) ) {
$entry = ( $_POST && isset( $_POST['id'] ) ) ? $_POST['id'] : false;
}

FrmEntriesHelper::maybe_get_entry($entry);
FrmEntriesHelper::maybe_get_entry( $entry );
}

if ( ! $entry ) {
return $content;
}

if ( is_object($form) ) {
if ( is_object( $form ) ) {
$form = $form->id;
}

$shortcodes = FrmFieldsHelper::get_shortcodes($content, $form);
$content = apply_filters('frm_replace_content_shortcodes', $content, $entry, $shortcodes);
$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );

return $content;
}

public static function replace_content_shortcodes($content, $entry, $shortcodes) {
return FrmFieldsHelper::replace_content_shortcodes($content, $entry, $shortcodes);
public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
}

public static function process_bulk_form_actions($errors) {
public static function process_bulk_form_actions( $errors ) {
if ( ! $_REQUEST ) {
return $errors;
}

$bulkaction = FrmAppHelper::get_param('action');
$bulkaction = FrmAppHelper::get_param( 'action' );
if ( $bulkaction == -1 ) {
$bulkaction = FrmAppHelper::get_param('action2');
$bulkaction = FrmAppHelper::get_param( 'action2' );
}

if ( ! empty($bulkaction) && strpos($bulkaction, 'bulk_') === 0 ) {
if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
FrmAppHelper::remove_get_action();

$bulkaction = str_replace('bulk_', '', $bulkaction);
$bulkaction = str_replace( 'bulk_', '', $bulkaction );
}

$ids = FrmAppHelper::get_param('item-action', '');
if ( empty($ids) ) {
$ids = FrmAppHelper::get_param( 'item-action', '' );
if ( empty( $ids ) ) {
$errors[] = __( 'No forms were specified', 'formidable' );
return $errors;
}

$permission_error = FrmAppHelper::permission_nonce_error('', '_wpnonce', 'bulk-toplevel_page_formidable');
$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
if ( $permission_error !== false ) {
$errors[] = $permission_error;
return $errors;
}

if ( ! is_array($ids) ) {
$ids = explode(',', $ids);
if ( ! is_array( $ids ) ) {
$ids = explode( ',', $ids );
}

switch ( $bulkaction ) {
case 'delete':
$message = self::bulk_destroy($ids);
$message = self::bulk_destroy( $ids );
break;
case 'trash':
$message = self::bulk_trash($ids);
$message = self::bulk_trash( $ids );
break;
case 'untrash':
$message = self::bulk_untrash($ids);
$message = self::bulk_untrash( $ids );
break;
case 'create_template':
$message = self::bulk_create_template($ids);
$message = self::bulk_create_template( $ids );
break;
}

if ( isset( $message ) && ! empty( $message ) ) {
echo '<div id="message" class="updated frm_msg_padding">'. $message .'</div>';
echo '<div id="message" class="updated frm_msg_padding">'.$message.'</div>';
}

return $errors;
Expand Down Expand Up @@ -841,7 +841,7 @@ public static function route() {
}
}

public static function json_error($errors) {
public static function json_error( $errors ) {
$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
return $errors;
}
Expand Down Expand Up @@ -930,57 +930,57 @@ public static function get_form_shortcode($atts) {
);
}

public static function show_form($id = '', $key = '', $title = false, $description = false, $atts = array()) {
if ( empty($id) ) {
public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
if ( empty( $id ) ) {
$id = $key;
}

// no form id or key set
if ( empty($id) ) {
if ( empty( $id ) ) {
return __( 'Please select a valid form', 'formidable' );
}

$form = FrmForm::getOne($id);
$form = FrmForm::getOne( $id );
if ( ! $form || $form->parent_form_id ) {
return __( 'Please select a valid form', 'formidable' );
}

add_action('frm_load_form_hooks', 'FrmFormsController::trigger_load_form_hooks');
add_action( 'frm_load_form_hooks', 'FrmFormsController::trigger_load_form_hooks' );
FrmAppHelper::trigger_hook_load( 'form', $form );

$form = apply_filters('frm_pre_display_form', $form);
$form = apply_filters( 'frm_pre_display_form', $form );

$frm_settings = FrmAppHelper::get_settings();

// don't show a draft form on a page
global $post;
if ( $form->status == 'draft' && current_user_can('frm_edit_forms') && ( ! $post || $post->ID != $frm_settings->preview_page_id ) && ! FrmAppHelper::is_preview_page() ) {
if ( $form->status == 'draft' && current_user_can( 'frm_edit_forms' ) && ( ! $post || $post->ID != $frm_settings->preview_page_id ) && ! FrmAppHelper::is_preview_page() ) {
return __( 'Please select a valid form', 'formidable' );
}

// don't show the form if user should be logged in
if ( $form->logged_in && ! is_user_logged_in() ) {
return do_shortcode($frm_settings->login_msg);
return do_shortcode( $frm_settings->login_msg );
}

// don't show the form if user doesn't have permission
if ( $form->logged_in && get_current_user_id() && isset($form->options['logged_in_role']) && $form->options['logged_in_role'] != '' && !FrmAppHelper::user_has_permission($form->options['logged_in_role']) ) {
return do_shortcode($frm_settings->login_msg);
if ( $form->logged_in && get_current_user_id() && isset( $form->options['logged_in_role'] ) && $form->options['logged_in_role'] != '' && ! FrmAppHelper::user_has_permission( $form->options['logged_in_role'] ) ) {
return do_shortcode( $frm_settings->login_msg );
}

$form = self::get_form($form, $title, $description, $atts);
$form = self::get_form( $form, $title, $description, $atts );

// check for external shortcodes
$form = do_shortcode($form);
$form = do_shortcode( $form );

return $form;
}

public static function get_form($form, $title, $description, $atts = array()) {
public static function get_form( $form, $title, $description, $atts = array() ) {
ob_start();

self::get_form_contents($form, $title, $description, $atts);
FrmEntriesHelper::enqueue_scripts( FrmEntriesController::get_params($form) );
self::get_form_contents( $form, $title, $description, $atts );
FrmEntriesHelper::enqueue_scripts( FrmEntriesController::get_params( $form ) );

$contents = ob_get_contents();
ob_end_clean();
Expand Down
4 changes: 2 additions & 2 deletions classes/controllers/FrmHooksController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ class FrmHooksController {
* Trigger plugin-wide hook loading
*/
public static function trigger_load_hook( $hooks = 'load_hooks' ) {
$controllers = apply_filters('frm_load_controllers', array( 'FrmHooksController' ) );
$controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );

$trigger_hooks = $hooks;
$hooks = (array) $hooks;

if ( 'load_hooks' == $trigger_hooks ) {
if ( is_admin() ) {
$hooks[] = 'load_admin_hooks';
if ( defined('DOING_AJAX') ) {
if ( defined( 'DOING_AJAX' ) ) {
$hooks[] = 'load_ajax_hooks';
$hooks[] = 'load_form_hooks';
}
Expand Down
18 changes: 9 additions & 9 deletions classes/controllers/FrmSettingsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ public static function process_form( $stop_load = false ) {

$frm_settings = FrmAppHelper::get_settings();

if ( ! isset($_POST['process_form']) || ! wp_verify_nonce($_POST['process_form'], 'process_form_nonce') ) {
wp_die($frm_settings->admin_permission);
if ( ! isset( $_POST['process_form'] ) || ! wp_verify_nonce( $_POST['process_form'], 'process_form_nonce' ) ) {
wp_die( $frm_settings->admin_permission );
}

$errors = array();
$message = '';

if ( ! isset($frm_vars['settings_routed']) || ! $frm_vars['settings_routed'] ) {
if ( ! isset( $frm_vars['settings_routed'] ) || ! $frm_vars['settings_routed'] ) {
//$errors = $frm_settings->validate($_POST,array());
$frm_settings->update(stripslashes_deep($_POST));
$frm_settings->update( stripslashes_deep( $_POST ) );

if ( empty($errors) ) {
if ( empty( $errors ) ) {
$frm_settings->store();
$message = __( 'Settings Saved', 'formidable' );
}
Expand All @@ -55,14 +55,14 @@ public static function process_form( $stop_load = false ) {
return;
}

self::display_form($errors, $message);
self::display_form( $errors, $message );
}

public static function route( $stop_load = false ) {
$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
$action = FrmAppHelper::get_param($action);
$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
$action = FrmAppHelper::get_param( $action );
if ( $action == 'process-form' ) {
return self::process_form($stop_load);
return self::process_form( $stop_load );
} else if ( $stop_load != 'stop_load' ) {
return self::display_form();
}
Expand Down
Loading