@@ -146,8 +146,8 @@ discard block |
||
146 | 146 | } |
147 | 147 | |
148 | 148 | /** |
149 | - * Get value from the associative array of the plugin defaults option |
|
150 | - * |
|
149 | + * Get value from the associative array of the plugin defaults option |
|
150 | + * |
|
151 | 151 | * @param $key |
152 | 152 | * @param bool $default |
153 | 153 | * |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | if ( isset( $attribute_value ) && ctype_alnum( $attribute_value ) && key_exists( $attribute_value, \PodloveSubscribeButton\Model\Button::$$attribute ) ) { |
234 | 234 | return $attribute_value; |
235 | 235 | } else { |
236 | - $default = get_option( 'podlove_psb_defaults', \PodloveSubscribeButton\Defaults::options() ); |
|
236 | + $default = get_option( 'podlove_psb_defaults', \PodloveSubscribeButton\Defaults::options() ); |
|
237 | 237 | return $default[ $attribute ]; |
238 | 238 | } |
239 | 239 |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | parent::__construct( array( |
23 | 23 | 'singular' => 'feed', // singular name of the listed records |
24 | 24 | 'plural' => 'feeds', // plural name of the listed records |
25 | - 'ajax' => false, // does this table support ajax? |
|
25 | + 'ajax' => false, // does this table support ajax? |
|
26 | 26 | ) ); |
27 | 27 | |
28 | 28 | } |
@@ -53,14 +53,14 @@ discard block |
||
53 | 53 | |
54 | 54 | $preview = "<div class='podlove-button-preview-container'>"; |
55 | 55 | $preview .= $button->render( |
56 | - $options['size'], |
|
57 | - $options['autowidth'], |
|
58 | - $options['style'], |
|
59 | - $options['format'], |
|
60 | - $options['color'], |
|
56 | + $options[ 'size' ], |
|
57 | + $options[ 'autowidth' ], |
|
58 | + $options[ 'style' ], |
|
59 | + $options[ 'format' ], |
|
60 | + $options[ 'color' ], |
|
61 | 61 | false, |
62 | 62 | false, |
63 | - $options['language'] |
|
63 | + $options[ 'language' ] |
|
64 | 64 | ); |
65 | 65 | $preview .= "</div>"; |
66 | 66 |
@@ -97,19 +97,19 @@ discard block |
||
97 | 97 | */ |
98 | 98 | private function get_feeds_as_array( $feeds = array() ) { |
99 | 99 | foreach ( $feeds as $feed ) { |
100 | - if ( isset( Defaults::media_types()[ $feed['format'] ]['extension'] ) ) { |
|
100 | + if ( isset( Defaults::media_types()[ $feed[ 'format' ] ][ 'extension' ] ) ) { |
|
101 | 101 | $new_feed = array( |
102 | 102 | 'type' => 'audio', |
103 | - 'format' => Defaults::media_types()[ $feed['format'] ]['extension'], |
|
104 | - 'url' => $feed['url'], |
|
103 | + 'format' => Defaults::media_types()[ $feed[ 'format' ] ][ 'extension' ], |
|
104 | + 'url' => $feed[ 'url' ], |
|
105 | 105 | 'variant' => 'high', |
106 | 106 | ); |
107 | 107 | |
108 | - if ( isset( $feed['itunesfeedid'] ) && $feed['itunesfeedid'] > 0 ) { |
|
109 | - $new_feed['directory-url-itunes'] = "https://itunes.apple.com/podcast/id" . $feed['itunesfeedid']; |
|
108 | + if ( isset( $feed[ 'itunesfeedid' ] ) && $feed[ 'itunesfeedid' ] > 0 ) { |
|
109 | + $new_feed[ 'directory-url-itunes' ] = "https://itunes.apple.com/podcast/id" . $feed[ 'itunesfeedid' ]; |
|
110 | 110 | } |
111 | 111 | |
112 | - $feeds[] = $new_feed; |
|
112 | + $feeds[ ] = $new_feed; |
|
113 | 113 | |
114 | 114 | } |
115 | 115 | } |
@@ -158,10 +158,10 @@ discard block |
||
158 | 158 | |
159 | 159 | return array( |
160 | 160 | // $attribute => $value |
161 | - 'size' => ( $size == 'default' ? $options['size'] : $size ) . self::interpret_autowidth_attribute( $autowidth ), |
|
162 | - 'style' => ( $style == 'default' ? $options['style'] : $style ), |
|
163 | - 'format' => ( $format == 'default' ? $options['format'] : $format ), |
|
164 | - 'color' => ( isset( $color ) ? $color : $options['color'] ), |
|
161 | + 'size' => ( $size == 'default' ? $options[ 'size' ] : $size ) . self::interpret_autowidth_attribute( $autowidth ), |
|
162 | + 'style' => ( $style == 'default' ? $options[ 'style' ] : $style ), |
|
163 | + 'format' => ( $format == 'default' ? $options[ 'format' ] : $format ), |
|
164 | + 'color' => ( isset( $color ) ? $color : $options[ 'color' ] ), |
|
165 | 165 | 'json-data' => 'podcastData' . $this->id |
166 | 166 | ); |
167 | 167 | |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | * @return string |
174 | 174 | */ |
175 | 175 | private static function interpret_autowidth_attribute( $autowidth ) { |
176 | - if ( $autowidth == 'default' && get_option( 'podlove_psb_defaults' )['autowidth'] !== 'on' ) |
|
176 | + if ( $autowidth == 'default' && get_option( 'podlove_psb_defaults' )[ 'autowidth' ] !== 'on' ) |
|
177 | 177 | return ''; |
178 | 178 | |
179 | 179 | if ( $autowidth !== 'default' && $autowidth !== 'on' ) |
@@ -173,11 +173,13 @@ |
||
173 | 173 | * @return string |
174 | 174 | */ |
175 | 175 | private static function interpret_autowidth_attribute( $autowidth ) { |
176 | - if ( $autowidth == 'default' && get_option( 'podlove_psb_defaults' )['autowidth'] !== 'on' ) |
|
177 | - return ''; |
|
176 | + if ( $autowidth == 'default' && get_option( 'podlove_psb_defaults' )['autowidth'] !== 'on' ) { |
|
177 | + return ''; |
|
178 | + } |
|
178 | 179 | |
179 | - if ( $autowidth !== 'default' && $autowidth !== 'on' ) |
|
180 | - return ''; |
|
180 | + if ( $autowidth !== 'default' && $autowidth !== 'on' ) { |
|
181 | + return ''; |
|
182 | + } |
|
181 | 183 | |
182 | 184 | return ' auto'; |
183 | 185 |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | parent::__construct( |
29 | 29 | 'podlove_subscribe_button_wp_plugin_widget', |
30 | 30 | ( Helpers::is_podlove_publisher_active() ? 'Podlove Subscribe Button (WordPress plugin)' : 'Podlove Subscribe Button' ), |
31 | - array( 'description' => __( 'Adds a Podlove Subscribe Button to your Sidebar', 'podlove-subscribe-button' ), ) |
|
31 | + array( 'description' => __( 'Adds a Podlove Subscribe Button to your Sidebar', 'podlove-subscribe-button' ),) |
|
32 | 32 | ); |
33 | 33 | |
34 | 34 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | public function widget( $args, $instance ) { |
37 | 37 | // Fetch the (network)button by it's name |
38 | 38 | if ( ! $button = Model\Button::get_button_by_name( $instance[ 'button' ] ) ) { |
39 | - return sprintf( __( 'Oops. There is no button with the ID "%s".', 'podlove-subscribe-button' ), $args['button'] ); |
|
39 | + return sprintf( __( 'Oops. There is no button with the ID "%s".', 'podlove-subscribe-button' ), $args[ 'button' ] ); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | echo $args[ 'before_widget' ]; |
@@ -64,15 +64,15 @@ discard block |
||
64 | 64 | public function form( $instance ) { |
65 | 65 | $options = get_option( 'podlove_psb_defaults' ); |
66 | 66 | |
67 | - $title = isset( $instance[ 'title' ] ) ? $instance[ 'title' ] : ''; |
|
68 | - $button = isset( $instance[ 'button' ] ) ? $instance[ 'button' ] : ''; |
|
69 | - $size = isset( $instance[ 'size' ] ) ? $instance[ 'size' ] : $options['size']; |
|
70 | - $style = isset( $instance[ 'style' ] ) ? $instance[ 'style' ] : $options['style']; |
|
71 | - $format = isset( $instance[ 'format' ] ) ? $instance[ 'format' ] : $options['format']; |
|
67 | + $title = isset( $instance[ 'title' ] ) ? $instance[ 'title' ] : ''; |
|
68 | + $button = isset( $instance[ 'button' ] ) ? $instance[ 'button' ] : ''; |
|
69 | + $size = isset( $instance[ 'size' ] ) ? $instance[ 'size' ] : $options[ 'size' ]; |
|
70 | + $style = isset( $instance[ 'style' ] ) ? $instance[ 'style' ] : $options[ 'style' ]; |
|
71 | + $format = isset( $instance[ 'format' ] ) ? $instance[ 'format' ] : $options[ 'format' ]; |
|
72 | 72 | $autowidth = isset( $instance[ 'autowidth' ] ) ? $instance[ 'autowidth' ] : true; |
73 | - $infotext = isset( $instance[ 'infotext' ] ) ? $instance[ 'infotext' ] : ''; |
|
74 | - $color = isset( $instance[ 'color' ] ) ? $instance[ 'color' ] : $options['color']; |
|
75 | - $language = isset( $instance[ 'language' ] ) ? $instance[ 'language' ] : $options['language']; |
|
73 | + $infotext = isset( $instance[ 'infotext' ] ) ? $instance[ 'infotext' ] : ''; |
|
74 | + $color = isset( $instance[ 'color' ] ) ? $instance[ 'color' ] : $options[ 'color' ]; |
|
75 | + $language = isset( $instance[ 'language' ] ) ? $instance[ 'language' ] : $options[ 'language' ]; |
|
76 | 76 | |
77 | 77 | $buttons = Model\Button::all(); |
78 | 78 | if ( is_multisite() ) { |
@@ -68,7 +68,7 @@ |
||
68 | 68 | $language = get_option( 'WPLANG' ); |
69 | 69 | } |
70 | 70 | |
71 | - $lang_code = strtolower( explode( '_', $language )[0] ); |
|
71 | + $lang_code = strtolower( explode( '_', $language )[ 0 ] ); |
|
72 | 72 | |
73 | 73 | if ( in_array( $lang_code, \PodloveSubscribeButton\Defaults::button( 'language' ) ) ) { |
74 | 74 | return $lang_code; |
@@ -152,11 +152,11 @@ |
||
152 | 152 | |
153 | 153 | public static function sanitize_settings( $input = null ) { |
154 | 154 | |
155 | - $output = $input; |
|
155 | + $output = $input; |
|
156 | 156 | |
157 | - if ( ! array_key_exists('autowidth', $input ) ) { |
|
158 | - $output['autowidth'] = 'off'; |
|
159 | - } |
|
157 | + if ( ! array_key_exists('autowidth', $input ) ) { |
|
158 | + $output['autowidth'] = 'off'; |
|
159 | + } |
|
160 | 160 | |
161 | 161 | return $output; |
162 | 162 | } |
@@ -112,18 +112,18 @@ discard block |
||
112 | 112 | $option = get_option( 'podlove_psb_defaults' ); |
113 | 113 | } |
114 | 114 | |
115 | - switch ( $args['type'] ) { |
|
115 | + switch ( $args[ 'type' ] ) { |
|
116 | 116 | case 'checkbox': |
117 | 117 | ?> |
118 | - <input type="checkbox" name="<?php echo "podlove_psb_defaults[{$args['label_for']}]"; ?>" |
|
119 | - id="<?php echo "podlove_psb_defaults[{$args['label_for']}]"; ?>" <?php checked( $option[ $args['label_for'] ], 'on' ); ?> /> |
|
118 | + <input type="checkbox" name="<?php echo "podlove_psb_defaults[{$args[ 'label_for' ]}]"; ?>" |
|
119 | + id="<?php echo "podlove_psb_defaults[{$args[ 'label_for' ]}]"; ?>" <?php checked( $option[ $args[ 'label_for' ] ], 'on' ); ?> /> |
|
120 | 120 | <?php |
121 | 121 | break; |
122 | 122 | |
123 | 123 | case 'color': |
124 | 124 | ?> |
125 | 125 | <input id="podlove_psb_defaults[color]" name="podlove_psb_defaults[color]" class="podlove_subscribe_button_color" |
126 | - value="<?php echo $option['color'] ?>"/> |
|
126 | + value="<?php echo $option[ 'color' ] ?>"/> |
|
127 | 127 | <?php |
128 | 128 | break; |
129 | 129 | |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | ?> |
132 | 132 | <select name="podlove_psb_defaults[language]" id="podlove_psb_defaults[language]"> |
133 | 133 | <?php foreach ( Defaults::button( 'language' ) as $value ) : ?> |
134 | - <option value="<?php echo $value; ?>" <?php selected( $option['language'], $value ); ?>><?php echo $value; ?></option> |
|
134 | + <option value="<?php echo $value; ?>" <?php selected( $option[ 'language' ], $value ); ?>><?php echo $value; ?></option> |
|
135 | 135 | <?php endforeach; ?> |
136 | 136 | </select> |
137 | 137 | <?php |
@@ -140,9 +140,9 @@ discard block |
||
140 | 140 | |
141 | 141 | case 'select': |
142 | 142 | ?> |
143 | - <select name="podlove_psb_defaults[<?php echo $args['label_for']; ?>]" id="podlove_psb_defaults[<?php echo $args['label_for']; ?>]"> |
|
144 | - <?php foreach ( Defaults::button( $args['label_for'] ) as $value => $description ) { ?> |
|
145 | - <option value="<?php echo $value; ?>" <?php selected( $option[ $args['label_for'] ], $value ); ?>><?php echo $description; ?></option> |
|
143 | + <select name="podlove_psb_defaults[<?php echo $args[ 'label_for' ]; ?>]" id="podlove_psb_defaults[<?php echo $args[ 'label_for' ]; ?>]"> |
|
144 | + <?php foreach ( Defaults::button( $args[ 'label_for' ] ) as $value => $description ) { ?> |
|
145 | + <option value="<?php echo $value; ?>" <?php selected( $option[ $args[ 'label_for' ] ], $value ); ?>><?php echo $description; ?></option> |
|
146 | 146 | <?php } ?> |
147 | 147 | </select> |
148 | 148 | <?php break; |
@@ -154,8 +154,8 @@ discard block |
||
154 | 154 | |
155 | 155 | $output = $input; |
156 | 156 | |
157 | - if ( ! array_key_exists('autowidth', $input ) ) { |
|
158 | - $output['autowidth'] = 'off'; |
|
157 | + if ( ! array_key_exists( 'autowidth', $input ) ) { |
|
158 | + $output[ 'autowidth' ] = 'off'; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | return $output; |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | <div id="post-body" class="columns-2"> |
41 | 41 | <div id="post-body-content"> |
42 | 42 | <?php |
43 | - switch ( $action ) { |
|
44 | - case 'new': self::new_template(); break; |
|
45 | - case 'edit': self::edit_template(); break; |
|
46 | - case 'index': self::view_template(); break; |
|
47 | - default: self::view_template(); break; |
|
48 | - } |
|
49 | - ?> |
|
43 | + switch ( $action ) { |
|
44 | + case 'new': self::new_template(); break; |
|
45 | + case 'edit': self::edit_template(); break; |
|
46 | + case 'index': self::view_template(); break; |
|
47 | + default: self::view_template(); break; |
|
48 | + } |
|
49 | + ?> |
|
50 | 50 | </div> |
51 | 51 | <div id="postbox-container-1" class="postbox-container"> |
52 | 52 | <?php self::sidebar(); ?> |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | </div> |
93 | 93 | <?php |
94 | 94 | |
95 | - } |
|
95 | + } |
|
96 | 96 | |
97 | 97 | /** |
98 | 98 | * Process form: save/update a format |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | $table->display(); |
203 | 203 | |
204 | 204 | if ( $is_network ) { |
205 | - // https://vedovini.net/2015/10/using-the-wordpress-settings-api-with-network-admin-pages/ |
|
205 | + // https://vedovini.net/2015/10/using-the-wordpress-settings-api-with-network-admin-pages/ |
|
206 | 206 | ?> |
207 | 207 | <form method="post" action="edit.php?action=podlove_psb_update_network_options"> |
208 | 208 | <?php |
@@ -352,7 +352,7 @@ |
||
352 | 352 | |
353 | 353 | //Verify Post Referring Page |
354 | 354 | check_admin_referer( 'podlove-psb-options' ); |
355 | - update_site_option( 'podlove_psb_defaults', $_POST['podlove_psb_defaults'] ); |
|
355 | + update_site_option( 'podlove_psb_defaults', $_POST[ 'podlove_psb_defaults' ] ); |
|
356 | 356 | |
357 | 357 | //Redirect to Network Settings Page |
358 | 358 | wp_redirect( add_query_arg( array( 'page' => 'podlove-subscribe-button', 'updated' => 'true' ), network_admin_url( 'settings.php' ) ) ); |
@@ -135,7 +135,7 @@ |
||
135 | 135 | 'podlove_subscribe_button_default_format', |
136 | 136 | 'podlove_subscribe_button_default_language', |
137 | 137 | ); |
138 | - $options = array(); |
|
138 | + $options = array(); |
|
139 | 139 | |
140 | 140 | foreach ( $old_options as $option ) { |
141 | 141 |