Skip to content

Commit 2070a27

Browse files
tyrann0ustyrann0us
committed
Several code formatting changes according to the WordPress coding standards
Additional: Note in readme.txt about a bug that has been introduced in 0.4 (only in SVN repo).
1 parent 6603a08 commit 2070a27

File tree

9 files changed

+216
-188
lines changed

9 files changed

+216
-188
lines changed

inc/cache.class.php renamed to inc/class-cache.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* @since 0.1
99
*/
10-
class slickSliderCache {
10+
class Slick_Slider_Cache {
1111

1212
/**
1313
* Cached values stored in array.
@@ -32,11 +32,11 @@ public static function get( $key ) {
3232
if ( empty( $key ) ) {
3333
return;
3434
}
35-
$cache = ( array ) self::$_cache;
36-
if ( empty( $cache[$key] ) ) {
35+
$cache = (array) self::$_cache;
36+
if ( empty( $cache[ $key ] ) ) {
3737
return null;
3838
}
39-
return $cache[$key];
39+
return $cache[ $key ];
4040

4141
}
4242

@@ -54,9 +54,9 @@ public static function set( $key, $value ) {
5454
if ( empty( $key ) ) {
5555
return;
5656
}
57-
$cache = ( array ) self::$_cache;
58-
$cache[$key] = $value;
57+
$cache = (array) self::$_cache;
58+
$cache[ $key ] = $value;
5959
self::$_cache = $cache;
6060

6161
}
62-
}
62+
}

inc/feedback.class.php renamed to inc/class-feedback.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @since 0.1
88
*/
9-
class slickSliderFeedback {
9+
class Slick_Slider_Feedback {
1010

1111
/**
1212
* Add warning if PHP and/or WordPress version is too low.
@@ -15,12 +15,12 @@ class slickSliderFeedback {
1515
*/
1616
public static function rules() {
1717

18-
switch ( slickSliderMain::currentPage() ) {
18+
switch ( Slick_Slider_Main::current_page() ) {
1919
case 'plugins' :
2020
case 'options-media' :
21-
if ( ! slickSliderMain::isMinWp( '4.4' ) ) {
22-
self::add( 'critical', sprintf( '%s: %s %s.', __( 'Attention', 'slick-slider' ), __( 'Slick Slider requires at least WordPress', 'slick-slider' ), '4.4' ) );
23-
} else if ( ! slickSliderMain::isMinPhp( SLICK_SLIDER_MIN_PHP ) ) {
21+
if ( ! Slick_Slider_Main::is_min_wp( SLICK_SLIDER_MIN_WP ) ) {
22+
self::add( 'critical', sprintf( '%s: %s %s.', __( 'Attention', 'slick-slider' ), __( 'Slick Slider requires at least WordPress', 'slick-slider' ), SLICK_SLIDER_MIN_WP ) );
23+
} elseif ( ! Slick_Slider_Main::is_min_php( SLICK_SLIDER_MIN_PHP ) ) {
2424
self::add( 'critical', sprintf( '%s: %s %s.', __( 'Attention', 'slick-slider' ), __( 'Slick Slider requires at least PHP', 'slick-slider' ), SLICK_SLIDER_MIN_PHP ) );
2525
}
2626
break;
@@ -40,15 +40,15 @@ public static function rules() {
4040
*/
4141
public static function add( $type, $msg ) {
4242

43-
if ( empty( $type ) OR empty( $msg ) OR ! in_array( $type, array(
43+
if ( empty( $type ) || empty( $msg ) || ! in_array( $type, array(
4444
'critical',
4545
'notice'
4646
) ) ) {
4747
return false;
4848
}
49-
$data = ( array ) slickSliderCache::get( 'feedback' );
50-
$data[$type] = $msg;
51-
SlickSliderCache::set( 'feedback', $data );
49+
$data = (array) Slick_Slider_Cache::get( 'feedback' );
50+
$data[ $type ] = $msg;
51+
Slick_Slider_Cache::set( 'feedback', $data );
5252

5353
}
5454

@@ -62,7 +62,7 @@ public static function add( $type, $msg ) {
6262
*/
6363
public static function get( $type = '' ) {
6464

65-
$data = ( array ) slickSliderCache::get( 'feedback' );
65+
$data = (array) Slick_Slider_Cache::get( 'feedback' );
6666
if ( empty( $data ) ) {
6767
return false;
6868
}
@@ -72,8 +72,8 @@ public static function get( $type = '' ) {
7272
if ( in_array( $type, array(
7373
'critical',
7474
'notice'
75-
) ) && ! empty( $data[$type] ) ) {
76-
return $data[$type];
75+
) ) && ! empty( $data[ $type ] ) ) {
76+
return $data[ $type ];
7777
}
7878
return false;
7979

@@ -122,11 +122,11 @@ private static function _display() {
122122
foreach ( $errors as $type => $msg ) {
123123
echo sprintf(
124124
'<div class="notice notice-%s is-dismissible"><p>%s</p></div>',
125-
esc_attr( $matrix[$type] ),
125+
esc_attr( $matrix[ $type ] ),
126126
$msg
127127
);
128128
}
129129

130130
}
131131

132-
}
132+
}

inc/gui.class.php renamed to inc/class-gui.php

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* @since 0.1
99
*/
10-
class slickSliderGui {
10+
class Slick_Slider_Gui {
1111

1212
/**
1313
* If set to true, skip saving Slick Slider options to database.
@@ -18,7 +18,7 @@ class slickSliderGui {
1818
*
1919
* @var boolean $skip_saving Whether to skip saving.
2020
*/
21-
private static $skipSaving = false;
21+
private static $skip_saving = false;
2222

2323
/**
2424
* Enqueue assets,
@@ -27,7 +27,7 @@ class slickSliderGui {
2727
*
2828
* @since 0.1
2929
*/
30-
public static function initSettings() {
30+
public static function init_settings() {
3131

3232
if ( ! current_user_can( 'manage_options' ) ) {
3333
return;
@@ -36,22 +36,22 @@ public static function initSettings() {
3636
'admin_enqueue_scripts',
3737
array(
3838
__CLASS__,
39-
'addCss'
39+
'add_css'
4040
)
4141
);
4242
add_action(
4343
'admin_print_styles',
4444
array(
4545
__CLASS__,
46-
'addJs'
46+
'add_js'
4747
)
4848
);
4949

5050
add_action(
5151
'load-options-media.php',
5252
array(
5353
__CLASS__,
54-
'addHelpTab'
54+
'add_help_tab'
5555
)
5656
);
5757

@@ -60,13 +60,13 @@ public static function initSettings() {
6060
__( 'Slick Slider settings', 'slick-slider' ),
6161
array(
6262
__CLASS__,
63-
'settingSectionCallback'
63+
'setting_section_callback'
6464
),
6565
'media'
6666
);
6767

68-
$pagenow = slickSliderMain::currentPage();
69-
slickSliderOptions::renderSettingsMarkup( $pagenow );
68+
$pagenow = Slick_Slider_Main::current_page();
69+
Slick_Slider_Options::render_settings_markup( $pagenow );
7070

7171
}
7272

@@ -75,15 +75,15 @@ public static function initSettings() {
7575
*
7676
* @since 0.1
7777
*/
78-
public static function addCss() {
78+
public static function add_css() {
7979

80-
$assetSuffix = slickSliderMain::getAssetSuffix();
80+
$assetSuffix = Slick_Slider_Main::get_asset_suffix();
8181

8282
wp_enqueue_style(
8383
'slick-slider-options-media',
84-
slickSliderMain::pluginUrl( "css/slick-slider-options-media{$assetSuffix}.css" ),
84+
Slick_Slider_Main::plugin_url( "css/slick-slider-options-media{$assetSuffix}.css" ),
8585
array(),
86-
slickSliderMain::getPluginData( 'Version' )
86+
Slick_Slider_Main::get_plugin_data( 'Version' )
8787
);
8888

8989
}
@@ -93,15 +93,15 @@ public static function addCss() {
9393
*
9494
* @since 0.1
9595
*/
96-
public static function addJs() {
96+
public static function add_js() {
9797

98-
$assetSuffix = slickSliderMain::getAssetSuffix();
98+
$assetSuffix = Slick_Slider_Main::get_asset_suffix();
9999

100100
wp_enqueue_script(
101101
'slick-slider-options-media',
102-
slickSliderMain::pluginUrl( "js/slick-slider-options-media{$assetSuffix}.js" ),
102+
Slick_Slider_Main::plugin_url( "js/slick-slider-options-media{$assetSuffix}.js" ),
103103
array( 'jquery-ui-accordion' ),
104-
slickSliderMain::getPluginData( 'Version' )
104+
Slick_Slider_Main::get_plugin_data( 'Version' )
105105
);
106106

107107
}
@@ -111,7 +111,7 @@ public static function addJs() {
111111
*
112112
* @since 0.1
113113
*/
114-
public static function addHelpTab() {
114+
public static function add_help_tab() {
115115
$screen = get_current_screen();
116116
$screen->add_help_tab( array(
117117
'id' => 'slick-slider-help',
@@ -131,7 +131,7 @@ public static function addHelpTab() {
131131
*
132132
* @since 0.1
133133
*/
134-
public static function settingSectionCallback() {
134+
public static function setting_section_callback() {
135135

136136
wp_nonce_field( '_slick__settings_nonce', '_slick_nonce' );
137137
echo '<a name="slick-slider-settings" id="slick-slider-settings"></a>';
@@ -150,9 +150,9 @@ public static function settingSectionCallback() {
150150
*
151151
* @since 0.1
152152
*/
153-
public static function saveChanges() {
153+
public static function save_changes() {
154154

155-
if ( self::$skipSaving ) {
155+
if ( self::$skip_saving ) {
156156
return;
157157
}
158158
if ( empty( $_POST ) || empty( $_POST['_slick_action'] ) ) {
@@ -168,13 +168,13 @@ public static function saveChanges() {
168168
return;
169169
}
170170

171-
self::$skipSaving = true;
171+
self::$skip_saving = true;
172172
$_POST = array_map( 'stripslashes_deep', $_POST );
173173
if ( isset( $_POST['_slick_reset'] ) ) {
174-
slickSliderOptions::reset();
174+
Slick_Slider_Options::reset();
175175
return;
176176
}
177-
slickSliderOptions::update( $_POST, true );
177+
Slick_Slider_Options::update( $_POST, true );
178178

179179
}
180-
}
180+
}

0 commit comments

Comments
 (0)