| @@ -18,16 +18,16 @@ | ||
| 18 | 18 | |
| 19 | 19 | defined( 'WPINC' ) || die; | 
| 20 | 20 | |
| 21 | -if( !class_exists( 'GL_Plugin_Check_v1' )) { | |
| 21 | +if( !class_exists( 'GL_Plugin_Check_v1' ) ) { | |
| 22 | 22 | require_once __DIR__.'/activate.php'; | 
| 23 | 23 | } | 
| 24 | -if( GL_Plugin_Check_v1::shouldDeactivate( __FILE__, array( 'wordpress' => '4.7.0' )))return; | |
| 24 | +if( GL_Plugin_Check_v1::shouldDeactivate( __FILE__, array( 'wordpress' => '4.7.0' ) ) )return; | |
| 25 | 25 | |
| 26 | 26 | require_once __DIR__.'/autoload.php'; | 
| 27 | 27 | require_once __DIR__.'/helpers.php'; | 
| 28 | 28 | |
| 29 | 29 | $app = new GeminiLabs\SiteReviews\Application; | 
| 30 | 30 | $app->make( 'Provider' )->register( $app ); | 
| 31 | -register_activation_hook( __FILE__, array( $app, 'activate' )); | |
| 32 | -register_deactivation_hook( __FILE__, array( $app, 'deactivate' )); | |
| 31 | +register_activation_hook( __FILE__, array( $app, 'activate' ) ); | |
| 32 | +register_deactivation_hook( __FILE__, array( $app, 'deactivate' ) ); | |
| 33 | 33 | $app->init(); | 
| @@ -6,7 +6,7 @@ discard block | ||
| 6 | 6 | */ | 
| 7 | 7 |  function glsr( $alias = null ) { | 
| 8 | 8 | $app = \GeminiLabs\SiteReviews\Application::load(); | 
| 9 | - return empty( $alias ) | |
| 9 | + return empty($alias) | |
| 10 | 10 | ? $app | 
| 11 | 11 | : $app->make( $alias ); | 
| 12 | 12 | } | 
| @@ -16,10 +16,10 @@ discard block | ||
| 16 | 16 | * @return \WP_Screen|object | 
| 17 | 17 | */ | 
| 18 | 18 |  function glsr_current_screen() { | 
| 19 | -	if( function_exists( 'get_current_screen' )) { | |
| 19 | +	if( function_exists( 'get_current_screen' ) ) { | |
| 20 | 20 | $screen = get_current_screen(); | 
| 21 | 21 | } | 
| 22 | - return empty( $screen ) | |
| 22 | + return empty($screen) | |
| 23 | 23 | ? (object)array_fill_keys( ['base', 'id', 'post_type'], null ) | 
| 24 | 24 | : $screen; | 
| 25 | 25 | } | 
| @@ -54,11 +54,11 @@ discard block | ||
| 54 | 54 | */ | 
| 55 | 55 |  function glsr_log() { | 
| 56 | 56 | $args = func_get_args(); | 
| 57 | - $context = isset( $args[1] ) | |
| 57 | + $context = isset($args[1]) | |
| 58 | 58 | ? $args[1] | 
| 59 | 59 | : []; | 
| 60 | 60 | $logger = glsr( 'Modules\Logger' ); | 
| 61 | - return empty( $args ) | |
| 61 | + return empty($args) | |
| 62 | 62 | ? $logger | 
| 63 | 63 | : $logger->log( 'debug', $args[0], $context ); | 
| 64 | 64 | } | 
| @@ -2,31 +2,31 @@ | ||
| 2 | 2 | |
| 3 | 3 | $render->rating( 'rating', [ | 
| 4 | 4 | 'label' => __( 'Your overall rating', 'site-reviews' ), | 
| 5 | -]); | |
| 5 | +] ); | |
| 6 | 6 | $render->text( 'title', [ | 
| 7 | 7 | 'label' => __( 'Title of your review', 'site-reviews' ), | 
| 8 | 8 | 'placeholder' => __( 'Summarize your review or highlight an interesting detail', 'site-reviews' ), | 
| 9 | -]); | |
| 9 | +] ); | |
| 10 | 10 | $render->textarea( 'content', [ | 
| 11 | 11 | 'label' => __( 'Your review', 'site-reviews' ), | 
| 12 | 12 | 'placeholder' => __( 'Tell people your review', 'site-reviews' ), | 
| 13 | -]); | |
| 13 | +] ); | |
| 14 | 14 | $render->text( 'name', [ | 
| 15 | 15 | 'label' => __( 'Your name', 'site-reviews' ), | 
| 16 | 16 | 'placeholder' => __( 'Tell us your name', 'site-reviews' ), | 
| 17 | -]); | |
| 17 | +] ); | |
| 18 | 18 | $render->email( 'email', [ | 
| 19 | 19 | 'label' => __( 'Your email', 'site-reviews' ), | 
| 20 | 20 | 'placeholder' => __( 'Tell us your email', 'site-reviews' ), | 
| 21 | -]); | |
| 21 | +] ); | |
| 22 | 22 | $render->checkbox( 'terms', [ | 
| 23 | 23 | 'label' => __( 'This review is based on my own experience and is my genuine opinion.', 'site-reviews' ), | 
| 24 | -]); | |
| 24 | +] ); | |
| 25 | 25 | $render->honeypot( 'gotcha' ); | 
| 26 | 26 | $render->hidden( 'assign_to' ); | 
| 27 | 27 | $render->hidden( 'category' ); | 
| 28 | 28 | $render->hidden( 'excluded' ); | 
| 29 | 29 | $render->hidden( 'id' ); | 
| 30 | 30 | wp_nonce_field( 'post-review' ); | 
| 31 | -$render->submit( __( 'Submit your review', 'site-reviews' )); | |
| 31 | +$render->submit( __( 'Submit your review', 'site-reviews' ) ); | |
| 32 | 32 | $render->result(); | 
| @@ -197,7 +197,7 @@ | ||
| 197 | 197 | 'type' => 'text', | 
| 198 | 198 | ], | 
| 199 | 199 | 'settings.submissions.required' => [ | 
| 200 | - 'default' => ['title','content','name','email'], | |
| 200 | + 'default' => ['title', 'content', 'name', 'email'], | |
| 201 | 201 | 'label' => __( 'Required Fields', 'site-reviews' ), | 
| 202 | 202 | 'options' => [ | 
| 203 | 203 | 'title' => __( 'Title', 'site-reviews' ), | 
| @@ -20,22 +20,22 @@ discard block | ||
| 20 | 20 | 'class' => 'widefat', | 
| 21 | 21 | 'label' => __( 'Title', 'site-reviews' ), | 
| 22 | 22 | 'name' => 'title', | 
| 23 | - ]); | |
| 23 | + ] ); | |
| 24 | 24 |  		if( count( glsr()->reviewTypes ) > 1 ) { | 
| 25 | 25 | $this->renderField( 'select', [ | 
| 26 | 26 | 'class' => 'widefat', | 
| 27 | 27 | 'label' => __( 'Which type of review would you like to use?', 'site-reviews' ), | 
| 28 | 28 | 'name' => 'type', | 
| 29 | 29 | 'options' => ['' => __( 'All review types', 'site-reviews' )] + glsr()->reviewTypes, | 
| 30 | - ]); | |
| 30 | + ] ); | |
| 31 | 31 | } | 
| 32 | -		if( !empty( $terms )) { | |
| 32 | +		if( !empty($terms) ) { | |
| 33 | 33 | $this->renderField( 'select', [ | 
| 34 | 34 | 'class' => 'widefat', | 
| 35 | 35 | 'label' => __( 'Limit summary to this category', 'site-reviews' ), | 
| 36 | 36 | 'name' => 'category', | 
| 37 | 37 | 'options' => ['' => __( 'All Categories', 'site-reviews' )] + $terms, | 
| 38 | - ]); | |
| 38 | + ] ); | |
| 39 | 39 | } | 
| 40 | 40 | $this->renderField( 'text', [ | 
| 41 | 41 | 'class' => 'widefat', | 
| @@ -43,12 +43,12 @@ discard block | ||
| 43 | 43 | 'description' => sprintf( __( "Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews' ), '<code>post_id</code>' ), | 
| 44 | 44 | 'label' => __( 'Limit summary to reviews assigned to a page/post ID', 'site-reviews' ), | 
| 45 | 45 | 'name' => 'assigned_to', | 
| 46 | - ]); | |
| 46 | + ] ); | |
| 47 | 47 | $this->renderField( 'text', [ | 
| 48 | 48 | 'class' => 'widefat', | 
| 49 | 49 | 'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ), | 
| 50 | 50 | 'name' => 'class', | 
| 51 | - ]); | |
| 51 | + ] ); | |
| 52 | 52 | $this->renderField( 'checkbox', [ | 
| 53 | 53 | 'name' => 'hide', | 
| 54 | 54 | 'options' => [ | 
| @@ -58,7 +58,7 @@ discard block | ||
| 58 | 58 | 'summary' => __( 'Hide the summary text?', 'site-reviews' ), | 
| 59 | 59 | 'if_empty' => __( 'Hide the summary if no reviews are found?', 'site-reviews' ), | 
| 60 | 60 | ], | 
| 61 | - ]); | |
| 61 | + ] ); | |
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | 64 | /** | 
| @@ -20,30 +20,30 @@ discard block | ||
| 20 | 20 | 'class' => 'widefat', | 
| 21 | 21 | 'label' => __( 'Title', 'site-reviews' ), | 
| 22 | 22 | 'name' => 'title', | 
| 23 | - ]); | |
| 23 | + ] ); | |
| 24 | 24 | $this->renderField( 'textarea', [ | 
| 25 | 25 | 'class' => 'widefat', | 
| 26 | 26 | 'label' => __( 'Description', 'site-reviews' ), | 
| 27 | 27 | 'name' => 'description', | 
| 28 | - ]); | |
| 28 | + ] ); | |
| 29 | 29 | $this->renderField( 'select', [ | 
| 30 | 30 | 'class' => 'widefat', | 
| 31 | 31 | 'label' => __( 'Automatically assign a category', 'site-reviews' ), | 
| 32 | 32 | 'name' => 'category', | 
| 33 | 33 | 'options' => ['' => __( 'Do not assign a category', 'site-reviews' )] + $terms, | 
| 34 | - ]); | |
| 34 | + ] ); | |
| 35 | 35 | $this->renderField( 'text', [ | 
| 36 | 36 | 'class' => 'widefat', | 
| 37 | 37 | 'default' => '', | 
| 38 | 38 | 'description' => sprintf( __( 'You may also enter %s to assign to the current post.', 'site-reviews' ), '<code>post_id</code>' ), | 
| 39 | 39 | 'label' => __( 'Assign reviews to a custom page/post ID', 'site-reviews' ), | 
| 40 | 40 | 'name' => 'assign_to', | 
| 41 | - ]); | |
| 41 | + ] ); | |
| 42 | 42 | $this->renderField( 'text', [ | 
| 43 | 43 | 'class' => 'widefat', | 
| 44 | 44 | 'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ), | 
| 45 | 45 | 'name' => 'class', | 
| 46 | - ]); | |
| 46 | + ] ); | |
| 47 | 47 | $this->renderField( 'checkbox', [ | 
| 48 | 48 | 'name' => 'hide', | 
| 49 | 49 | 'options' => [ | 
| @@ -52,7 +52,7 @@ discard block | ||
| 52 | 52 | 'terms' => __( 'Hide the terms field', 'site-reviews' ), | 
| 53 | 53 | 'title' => __( 'Hide the title field', 'site-reviews' ), | 
| 54 | 54 | ], | 
| 55 | - ]); | |
| 55 | + ] ); | |
| 56 | 56 | } | 
| 57 | 57 | |
| 58 | 58 | /** | 
| @@ -20,14 +20,14 @@ discard block | ||
| 20 | 20 | 'class' => 'widefat', | 
| 21 | 21 | 'label' => __( 'Title', 'site-reviews' ), | 
| 22 | 22 | 'name' => 'title', | 
| 23 | - ]); | |
| 23 | + ] ); | |
| 24 | 24 | $this->renderField( 'number', [ | 
| 25 | 25 | 'class' => 'small-text', | 
| 26 | 26 | 'default' => 5, | 
| 27 | 27 | 'label' => __( 'How many reviews would you like to display?', 'site-reviews' ), | 
| 28 | 28 | 'max' => 100, | 
| 29 | 29 | 'name' => 'count', | 
| 30 | - ]); | |
| 30 | + ] ); | |
| 31 | 31 | $this->renderField( 'select', [ | 
| 32 | 32 | 'label' => __( 'What is the minimum rating to display?', 'site-reviews' ), | 
| 33 | 33 | 'name' => 'rating', | 
| @@ -38,22 +38,22 @@ discard block | ||
| 38 | 38 | '2' => sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ), | 
| 39 | 39 | '1' => sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ), | 
| 40 | 40 | ], | 
| 41 | - ]); | |
| 41 | + ] ); | |
| 42 | 42 |  		if( count( glsr()->reviewTypes ) > 1 ) { | 
| 43 | 43 | $this->renderField( 'select', [ | 
| 44 | 44 | 'class' => 'widefat', | 
| 45 | 45 | 'label' => __( 'Which reviews would you like to display?', 'site-reviews' ), | 
| 46 | 46 | 'name' => 'display', | 
| 47 | 47 | 'options' => ['' => __( 'All Reviews', 'site-reviews' )] + glsr()->reviewTypes, | 
| 48 | - ]); | |
| 48 | + ] ); | |
| 49 | 49 | } | 
| 50 | -		if( !empty( $terms )) { | |
| 50 | +		if( !empty($terms) ) { | |
| 51 | 51 | $this->renderField( 'select', [ | 
| 52 | 52 | 'class' => 'widefat', | 
| 53 | 53 | 'label' => __( 'Limit reviews to this category', 'site-reviews' ), | 
| 54 | 54 | 'name' => 'category', | 
| 55 | 55 | 'options' => ['' => __( 'All Categories', 'site-reviews' )] + $terms, | 
| 56 | - ]); | |
| 56 | + ] ); | |
| 57 | 57 | } | 
| 58 | 58 | $this->renderField( 'text', [ | 
| 59 | 59 | 'class' => 'widefat', | 
| @@ -61,12 +61,12 @@ discard block | ||
| 61 | 61 | 'description' => sprintf( __( "Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews' ), '<code>post_id</code>' ), | 
| 62 | 62 | 'label' => __( 'Limit reviews to those assigned to this page/post ID', 'site-reviews' ), | 
| 63 | 63 | 'name' => 'assigned_to', | 
| 64 | - ]); | |
| 64 | + ] ); | |
| 65 | 65 | $this->renderField( 'text', [ | 
| 66 | 66 | 'class' => 'widefat', | 
| 67 | 67 | 'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ), | 
| 68 | 68 | 'name' => 'class', | 
| 69 | - ]); | |
| 69 | + ] ); | |
| 70 | 70 | $this->renderField( 'checkbox', [ | 
| 71 | 71 | 'name' => 'hide', | 
| 72 | 72 | 'options' => [ | 
| @@ -77,7 +77,7 @@ discard block | ||
| 77 | 77 | 'response' => __( 'Hide the review response?', 'site-reviews' ), | 
| 78 | 78 | 'title' => __( 'Hide the review title?', 'site-reviews' ), | 
| 79 | 79 | ], | 
| 80 | - ]); | |
| 80 | + ] ); | |
| 81 | 81 | } | 
| 82 | 82 | |
| 83 | 83 | /** | 
| @@ -87,10 +87,10 @@ discard block | ||
| 87 | 87 | */ | 
| 88 | 88 | public function update( $newInstance, $oldInstance ) | 
| 89 | 89 |  	{ | 
| 90 | -		if( !is_numeric( $newInstance['count'] )) { | |
| 90 | +		if( !is_numeric( $newInstance['count'] ) ) { | |
| 91 | 91 | $newInstance['count'] = 10; | 
| 92 | 92 | } | 
| 93 | - $newInstance['count'] = min( 50, max( 0, intval( $newInstance['count'] ))); | |
| 93 | + $newInstance['count'] = min( 50, max( 0, intval( $newInstance['count'] ) ) ); | |
| 94 | 94 | return parent::update( $newInstance, $oldInstance ); | 
| 95 | 95 | } | 
| 96 | 96 | |
| @@ -27,10 +27,10 @@ discard block | ||
| 27 | 27 | 'after_widget' => '</div>', | 
| 28 | 28 | 'before_title' => '<h3 class="glsr-shortcode-title">', | 
| 29 | 29 | 'after_title' => '</h3>', | 
| 30 | - ]); | |
| 30 | + ] ); | |
| 31 | 31 | $instance = $this->normalize( $instance ); | 
| 32 | 32 | $partial = glsr( Html::class )->buildPartial( $shortcodePartial, $instance ); | 
| 33 | -		if( !empty( $instance['title'] )) { | |
| 33 | +		if( !empty($instance['title']) ) { | |
| 34 | 34 | $instance['title'] = $args['before_title'].$instance['title'].$args['after_title']; | 
| 35 | 35 | } | 
| 36 | 36 | return $args['before_widget'].$instance['title'].$partial.$args['after_widget']; | 
| @@ -73,10 +73,10 @@ discard block | ||
| 73 | 73 | */ | 
| 74 | 74 | public function normalize( $args ) | 
| 75 | 75 |  	{ | 
| 76 | - $args = shortcode_atts( $this->getDefaults(), wp_parse_args( $args )); | |
| 76 | + $args = shortcode_atts( $this->getDefaults(), wp_parse_args( $args ) ); | |
| 77 | 77 |  		array_walk( $args, function( &$value, $key ) { | 
| 78 | 78 | $methodName = glsr( Helper::class )->buildMethodName( $key, 'normalize' ); | 
| 79 | - if( !method_exists( $this, $methodName ))return; | |
| 79 | + if( !method_exists( $this, $methodName ) )return; | |
| 80 | 80 | $value = $this->$methodName( $value ); | 
| 81 | 81 | }); | 
| 82 | 82 | return $this->sanitize( $args ); | 
| @@ -108,7 +108,7 @@ discard block | ||
| 108 | 108 | */ | 
| 109 | 109 | protected function normalizeHide( $hide ) | 
| 110 | 110 |  	{ | 
| 111 | -		if( is_string( $hide )) { | |
| 111 | +		if( is_string( $hide ) ) { | |
| 112 | 112 | $hide = explode( ',', $hide ); | 
| 113 | 113 | } | 
| 114 | 114 |  		return array_filter( array_map( 'trim', $hide ), function( $value ) { | 
| @@ -139,9 +139,9 @@ discard block | ||
| 139 | 139 | __( 'Terrible', 'site-reviews' ), | 
| 140 | 140 | ]; | 
| 141 | 141 | $defaults = array_pad( $defaults, Rating::MAX_RATING, '' ); | 
| 142 | - $labels = array_map( 'trim', explode( ',', $labels )); | |
| 142 | + $labels = array_map( 'trim', explode( ',', $labels ) ); | |
| 143 | 143 |  		foreach( $defaults as $i => $label ) { | 
| 144 | - if( empty( $labels[$i] ))continue; | |
| 144 | + if( empty($labels[$i]) )continue; | |
| 145 | 145 | $defaults[$i] = $labels[$i]; | 
| 146 | 146 | } | 
| 147 | 147 | return array_combine( range( Rating::MAX_RATING, 1 ), $defaults ); | 
| @@ -15,12 +15,12 @@ discard block | ||
| 15 | 15 | return [[ | 
| 16 | 16 | 'type' => 'container', | 
| 17 | 17 | 'html' => '<p class="strong">'.esc_html__( 'All settings are optional.', 'site-reviews' ).'</p>', | 
| 18 | - ],[ | |
| 18 | + ], [ | |
| 19 | 19 | 'label' => esc_html__( 'Title', 'site-reviews' ), | 
| 20 | 20 | 'name' => 'title', | 
| 21 | 21 | 'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ), | 
| 22 | 22 | 'type' => 'textbox', | 
| 23 | - ],[ | |
| 23 | + ], [ | |
| 24 | 24 | 'label' => esc_html__( 'Description', 'site-reviews' ), | 
| 25 | 25 | 'minHeight' => 60, | 
| 26 | 26 | 'minWidth' => 240, | 
| @@ -35,29 +35,29 @@ discard block | ||
| 35 | 35 | 'name' => 'assign_to', | 
| 36 | 36 | 'tooltip' => __( 'Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews' ), | 
| 37 | 37 | 'type' => 'textbox', | 
| 38 | - ],[ | |
| 38 | + ], [ | |
| 39 | 39 | 'label' => esc_html__( 'Classes', 'site-reviews' ), | 
| 40 | 40 | 'name' => 'class', | 
| 41 | 41 | 'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ), | 
| 42 | 42 | 'type' => 'textbox', | 
| 43 | - ],[ | |
| 43 | + ], [ | |
| 44 | 44 | 'columns' => 2, | 
| 45 | 45 | 'items' => [[ | 
| 46 | 46 | 'name' => 'hide_email', | 
| 47 | 47 | 'text' => esc_html__( 'Email', 'site-reviews' ), | 
| 48 | 48 | 'tooltip' => __( 'Hide the email field?', 'site-reviews' ), | 
| 49 | 49 | 'type' => 'checkbox', | 
| 50 | - ],[ | |
| 50 | + ], [ | |
| 51 | 51 | 'name' => 'hide_name', | 
| 52 | 52 | 'text' => esc_html__( 'Name', 'site-reviews' ), | 
| 53 | 53 | 'tooltip' => __( 'Hide the name field?', 'site-reviews' ), | 
| 54 | 54 | 'type' => 'checkbox', | 
| 55 | - ],[ | |
| 55 | + ], [ | |
| 56 | 56 | 'name' => 'hide_terms', | 
| 57 | 57 | 'text' => esc_html__( 'Terms', 'site-reviews' ), | 
| 58 | 58 | 'tooltip' => __( 'Hide the terms field?', 'site-reviews' ), | 
| 59 | 59 | 'type' => 'checkbox', | 
| 60 | - ],[ | |
| 60 | + ], [ | |
| 61 | 61 | 'name' => 'hide_title', | 
| 62 | 62 | 'text' => esc_html__( 'Title', 'site-reviews' ), | 
| 63 | 63 | 'tooltip' => __( 'Hide the title field?', 'site-reviews' ), | 
| @@ -67,7 +67,7 @@ discard block | ||
| 67 | 67 | 'layout' => 'grid', | 
| 68 | 68 | 'spacing' => 5, | 
| 69 | 69 | 'type' => 'container', | 
| 70 | - ],[ | |
| 70 | + ], [ | |
| 71 | 71 | 'hidden' => true, | 
| 72 | 72 | 'name' => 'id', | 
| 73 | 73 | 'type' => 'textbox', | 
| @@ -80,7 +80,7 @@ discard block | ||
| 80 | 80 | public function getTerms() | 
| 81 | 81 |  	{ | 
| 82 | 82 | $terms = glsr( Database::class )->getTerms(); | 
| 83 | -		if( empty( $terms )) { | |
| 83 | +		if( empty($terms) ) { | |
| 84 | 84 | return []; | 
| 85 | 85 | } | 
| 86 | 86 | return [ |