Skip to content

Scrutinizer Auto-Fixes #3

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 10, 2015
Merged

Scrutinizer Auto-Fixes #3

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
27 changes: 15 additions & 12 deletions classes/controllers/FrmFieldsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static function load_field() {
wp_die();
}

public static function create(){
public static function create() {
check_ajax_referer( 'frm_ajax', 'nonce' );

$field_type = sanitize_text_field( $_POST['field'] );
Expand All @@ -62,6 +62,9 @@ public static function create(){
wp_die();
}

/**
* @param integer $form_id
*/
public static function include_new_field($field_type, $form_id) {
$values = array();
if ( FrmAppHelper::pro_is_installed() ) {
Expand Down Expand Up @@ -116,7 +119,7 @@ public static function edit_name($field = 'name', $id = '') {
wp_die();
}

public static function update_ajax_option(){
public static function update_ajax_option() {
check_ajax_referer( 'frm_ajax', 'nonce' );

$field = FrmField::getOne($_POST['field']);
Expand All @@ -140,7 +143,7 @@ public static function update_ajax_option(){
wp_die();
}

public static function duplicate(){
public static function duplicate() {
check_ajax_referer( 'frm_ajax', 'nonce' );

global $wpdb;
Expand Down Expand Up @@ -188,7 +191,7 @@ public static function include_single_field( $field_id, $values, $form_id = 0 )
return $field;
}

public static function destroy(){
public static function destroy() {
check_ajax_referer( 'frm_ajax', 'nonce' );

FrmField::destroy($_POST['field_id']);
Expand All @@ -198,7 +201,7 @@ public static function destroy(){
/* Field Options */

//Add Single Option or Other Option
public static function add_option(){
public static function add_option() {
check_ajax_referer( 'frm_ajax', 'nonce' );

$id = (int) $_POST['field_id'];
Expand Down Expand Up @@ -302,7 +305,7 @@ public static function edit_option() {
wp_die();
}

public static function delete_option(){
public static function delete_option() {
check_ajax_referer( 'frm_ajax', 'nonce' );

$field = FrmField::getOne( (int) $_POST['field_id'] );
Expand Down Expand Up @@ -388,7 +391,7 @@ public static function import_choices() {
wp_die();
}

public static function import_options(){
public static function import_options() {
check_ajax_referer( 'frm_ajax', 'nonce' );

if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
Expand Down Expand Up @@ -449,7 +452,7 @@ public static function import_options(){
wp_die();
}

public static function update_order(){
public static function update_order() {
check_ajax_referer( 'frm_ajax', 'nonce' );
if ( isset($_POST) && isset($_POST['frm_field_id']) ) {
foreach ( $_POST['frm_field_id'] as $position => $item ) {
Expand All @@ -459,7 +462,7 @@ public static function update_order(){
wp_die();
}

public static function change_type($type){
public static function change_type($type) {
$type_switch = array(
'scale' => 'radio',
'10radio' => 'radio',
Expand All @@ -479,8 +482,8 @@ public static function change_type($type){
return $type;
}

public static function display_field_options($display){
switch($display['type']){
public static function display_field_options($display) {
switch($display['type']) {
case 'captcha':
$display['required'] = false;
$display['invalid'] = true;
Expand Down Expand Up @@ -673,7 +676,7 @@ public static function check_value( $opt, $opt_key, $field ) {
return $opt;
}

public static function check_label($opt){
public static function check_label($opt) {
if ( is_array($opt) ) {
$opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
}
Expand Down
48 changes: 24 additions & 24 deletions classes/controllers/FrmFormsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

class FrmFormsController{
class FrmFormsController {

public static function trigger_load_form_hooks() {
FrmHooksController::trigger_load_hook( 'load_form_hooks' );
Expand All @@ -13,7 +13,7 @@ public static function load_form_hooks() {
add_filter('frm_form_classes', 'FrmFormsController::form_classes' );
}

public static function menu(){
public static function menu() {
add_submenu_page('formidable', 'Formidable | '. __( 'Forms', 'formidable' ), __( 'Forms', 'formidable' ), 'frm_view_forms', 'formidable', 'FrmFormsController::route' );

add_filter('get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
Expand All @@ -22,20 +22,20 @@ public static function menu(){
add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
}

public static function head(){
public static function head() {
wp_enqueue_script('formidable-editinplace');

if ( wp_is_mobile() ) {
wp_enqueue_script( 'jquery-touch-punch' );
}
}

public static function register_widgets(){
public static function register_widgets() {
require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
register_widget('FrmShowForm');
}

public static function list_form(){
public static function list_form() {
FrmAppHelper::permission_check('frm_view_forms');

$params = FrmFormsHelper::get_params();
Expand All @@ -53,9 +53,9 @@ public static function new_form( $values = false ) {
$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
$action = $values ? $values[ $action ] : FrmAppHelper::get_param( $action );

if ($action == 'create'){
if ($action == 'create') {
return self::create($values);
}else if ($action == 'new'){
} else if ($action == 'new') {
$frm_field_selection = FrmFieldsHelper::field_selection();
$values = FrmFormsHelper::setup_new_vars($values);
$id = FrmForm::create( $values );
Expand All @@ -67,7 +67,7 @@ public static function new_form( $values = false ) {

$values['id'] = $id;
require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/new.php');
}else{
} else {
$all_templates = FrmForm::getAll( array( 'is_template' => 1), 'name');
require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/new-selection.php');
}
Expand Down Expand Up @@ -103,7 +103,7 @@ public static function create( $values = false ) {

$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/new.php');
}else{
} else {
FrmForm::update( $id, $values, true );
die(FrmAppHelper::js_redirect(admin_url('admin.php?page=formidable&frm_action=settings&id='. $id)));
}
Expand All @@ -125,7 +125,7 @@ public static function settings( $id = false, $message = '' ) {
return self::get_settings_vars($id, '', $message);
}

public static function update_settings(){
public static function update_settings() {
FrmAppHelper::permission_check('frm_edit_forms');

$id = FrmAppHelper::get_param('id');
Expand All @@ -143,7 +143,7 @@ public static function update_settings(){
return self::get_settings_vars($id, '', $message);
}

public static function edit_key(){
public static function edit_key() {
check_ajax_referer( 'frm_ajax', 'nonce' );
FrmAppHelper::permission_check('frm_edit_forms', 'hide');

Expand All @@ -156,7 +156,7 @@ public static function edit_key(){
wp_die();
}

public static function edit_description(){
public static function edit_description() {
check_ajax_referer( 'frm_ajax', 'nonce' );
FrmAppHelper::permission_check('frm_edit_forms', 'hide');

Expand Down Expand Up @@ -208,7 +208,7 @@ public static function bulk_create_template($ids) {
return __( 'Form template was Successfully Created', 'formidable' );
}

public static function duplicate(){
public static function duplicate() {
FrmAppHelper::permission_check('frm_edit_forms');

$params = FrmFormsHelper::get_params();
Expand All @@ -221,7 +221,7 @@ public static function duplicate(){
}
}

public static function page_preview(){
public static function page_preview() {
$params = FrmFormsHelper::get_params();
if ( ! $params['form'] ) {
return;
Expand All @@ -234,7 +234,7 @@ public static function page_preview(){
return self::show_form($form->id, '', true, true);
}

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

global $frm_vars;
Expand Down Expand Up @@ -377,15 +377,15 @@ public static function scheduled_delete($delete_timestamp = '') {
return $count;
}

public static function insert_form_button($content){
public static function insert_form_button($content) {
if ( current_user_can('frm_view_forms') ) {
$content .= '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . __( 'Add forms and content', 'formidable' ) . '"><span class="frm-buttons-icon wp-media-buttons-icon"></span> Formidable</a>';

}
return $content;
}

public static function insert_form_popup(){
public static function insert_form_popup() {
$page = basename($_SERVER['PHP_SELF']);
if ( ! in_array($page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php') ) ) {
return;
Expand Down Expand Up @@ -494,7 +494,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 @@ -518,7 +518,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 @@ -620,7 +620,7 @@ public static function form_classes($form) {
}
}

public static function get_email_html(){
public static function get_email_html() {
check_ajax_referer( 'frm_ajax', 'nonce' );
echo FrmEntriesController::show_entry_shortcode( array(
'form_id' => $_POST['form_id'],
Expand Down Expand Up @@ -717,7 +717,7 @@ public static function add_default_templates( $path, $default = true, $template
$path = untrailingslashit(trim($path));
$templates = glob( $path .'/*.php' );

for($i = count($templates) - 1; $i >= 0; $i--){
for($i = count($templates) - 1; $i >= 0; $i--) {
$filename = str_replace( '.php', '', str_replace( $path.'/', '', $templates[ $i ] ) );
$template_query = array( 'form_key' => $filename);
if ( $template ) {
Expand Down Expand Up @@ -753,7 +753,7 @@ public static function add_default_templates( $path, $default = true, $template
}
}

public static function route(){
public static function route() {
$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
$vars = array();
if ( isset( $_POST['frm_compact_fields'] ) ) {
Expand All @@ -775,7 +775,7 @@ public static function route(){
$vars = FrmAppHelper::json_to_array($json_vars);
$action = $vars[ $action ];
}
}else{
} else {
$action = FrmAppHelper::get_param($action);
if ( isset( $_REQUEST['delete_all'] ) ) {
// override the action for this page
Expand Down Expand Up @@ -1022,7 +1022,7 @@ public static function get_form_contents($form, $title, $description, $atts) {
return;
}

if ( $created && is_numeric($created) ){
if ( $created && is_numeric($created) ) {
$message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
$class = 'frm_message';
} else {
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
@@ -1,6 +1,6 @@
<?php

class FrmHooksController{
class FrmHooksController {
/**
* Trigger plugin-wide hook loading
*/
Expand Down Expand Up @@ -40,7 +40,7 @@ public static function trigger_load_hook( $hooks = 'load_hooks' ) {

}

public function load_hooks(){
public function load_hooks() {
if ( ! is_admin() ) {
add_filter('the_content', 'FrmAppController::page_route', 10);
}
Expand Down
8 changes: 4 additions & 4 deletions classes/controllers/FrmSettingsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

class FrmSettingsController{
class FrmSettingsController {

public static function menu(){
public static function menu() {
add_submenu_page('formidable', 'Formidable | '. __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route');
}

public static function license_box(){
public static function license_box() {
$a = isset($_GET['t']) ? $_GET['t'] : 'general_settings';
include(FrmAppHelper::plugin_path() .'/classes/views/frm-settings/license_box.php');
}
Expand Down Expand Up @@ -46,7 +46,7 @@ public static function process_form( $stop_load = false ) {
$frm_settings->store();
$message = __( 'Settings Saved', 'formidable' );
}
}else{
} else {
$message = __( 'Settings Saved', 'formidable' );
}

Expand Down
8 changes: 4 additions & 4 deletions classes/controllers/FrmStatisticsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?php

class FrmStatisticsController{
class FrmStatisticsController {

public static function menu(){
public static function menu() {
add_submenu_page( 'formidable', 'Formidable | '. __( 'Views', 'formidable' ), '<span class="frm_inactive_menu">'. __( 'Views', 'formidable' ) .'</span>', 'administrator', 'formidable-entry-templates', 'FrmStatisticsController::list_displays' );
}

public static function list_reports(){
public static function list_reports() {
add_filter('frm_form_stop_action_reports', '__return_true');
$form = FrmAppHelper::get_param('form', false);
require(FrmAppHelper::plugin_path() .'/classes/views/frm-statistics/list.php');
}

public static function list_displays(){
public static function list_displays() {
$form = FrmAppHelper::get_param('form', false);
require(FrmAppHelper::plugin_path() .'/classes/views/frm-statistics/list_displays.php');
}
Expand Down
Loading