Cyclone Slider - Version 2.9.7

Version Description

  • 2015-01-30 =
  • Fix nextgen gallery integration
Download this release

Release Info

Developer kosinix
Plugin Icon 128x128 Cyclone Slider
Version 2.9.7
Comparing to
See all releases

Code changes from version 2.9.6 to 2.9.7

Files changed (19) hide show
  1. README.txt +4 -1
  2. cyclone-slider.php +4 -5
  3. src/CycloneSlider/Admin.php +3 -7
  4. src/CycloneSlider/AssetLoader.php +2 -4
  5. src/CycloneSlider/Base.php +1 -1
  6. src/CycloneSlider/Data.php +2 -10
  7. src/CycloneSlider/ExportPage.php +2 -4
  8. src/CycloneSlider/Exporter.php +2 -4
  9. src/CycloneSlider/Frontend.php +1 -1
  10. src/CycloneSlider/ImportPage.php +2 -4
  11. src/CycloneSlider/Importer.php +2 -4
  12. src/CycloneSlider/Main.php +0 -64
  13. src/CycloneSlider/NextgenIntegration.php +4 -7
  14. src/CycloneSlider/Plugin.php +40 -0
  15. src/CycloneSlider/SettingsPage.php +1 -1
  16. src/CycloneSlider/TemplatesManager.php +1 -1
  17. src/CycloneSlider/Updater.php +1 -1
  18. src/CycloneSlider/Widgets.php +1 -1
  19. src/CycloneSlider/Youtube.php +0 -5
README.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://www.codefleet.net/donate/
4
  Tags: slider, slideshow, drag-and-drop, wordpress-slider, wordpress-slideshow, cycle 2, jquery, responsive, translation-ready, custom-post, cyclone-slider
5
  Requires at least: 3.5
6
  Tested up to: 4.1
7
- Stable tag: 2.9.6
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -103,6 +103,9 @@ Inside `wp-content` create a folder named "cycloneslider". Add your templates in
103
 
104
  == Changelog ==
105
 
 
 
 
106
  = 2.9.6 - 2015-01-12 =
107
  * Fix template Thumbnail thumb images not working when resize is false.
108
  * Fix missing alt attribute in slide images for Standard template.
4
  Tags: slider, slideshow, drag-and-drop, wordpress-slider, wordpress-slideshow, cycle 2, jquery, responsive, translation-ready, custom-post, cyclone-slider
5
  Requires at least: 3.5
6
  Tested up to: 4.1
7
+ Stable tag: 2.9.5
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
103
 
104
  == Changelog ==
105
 
106
+ = 2.9.7 - 2015-01-30 =
107
+ * Fix nextgen gallery integration
108
+
109
  = 2.9.6 - 2015-01-12 =
110
  * Fix template Thumbnail thumb images not working when resize is false.
111
  * Fix missing alt attribute in slide images for Standard template.
cyclone-slider.php CHANGED
@@ -3,12 +3,12 @@
3
  Plugin Name: Cyclone Slider 2
4
  Plugin URI: http://www.codefleet.net/cyclone-slider-2/
5
  Description: Create and manage sliders with ease. Built for both casual users and developers.
6
- Version: 2.9.6
7
  Author: Nico Amarilla
8
  Author URI: http://www.codefleet.net/
9
  License:
10
 
11
- Copyright 2013 (kosinix@codefleet.net)
12
 
13
  This program is free software; you can redistribute it and/or modify
14
  it under the terms of the GNU General Public License, version 2, as
@@ -43,13 +43,12 @@ add_action('plugins_loaded', 'cycloneslider_init');
43
  function cycloneslider_init() {
44
  global $cyclone_slider_plugin_instance;
45
 
46
- $plugin = new CycloneSlider_Main();
47
 
48
  $plugin['path'] = realpath(plugin_dir_path(__FILE__)) . DIRECTORY_SEPARATOR;
49
  $plugin['url'] = plugin_dir_url(__FILE__);
50
-
51
  $plugin['debug'] = false;
52
- $plugin['version'] = '2.9.6';
53
  $plugin['textdomain'] = 'cycloneslider';
54
  $plugin['slug'] = 'cyclone-slider-2/cyclone-slider.php';
55
  $plugin['nonce_name'] = 'cyclone_slider_builder_nonce';
3
  Plugin Name: Cyclone Slider 2
4
  Plugin URI: http://www.codefleet.net/cyclone-slider-2/
5
  Description: Create and manage sliders with ease. Built for both casual users and developers.
6
+ Version: 2.9.7
7
  Author: Nico Amarilla
8
  Author URI: http://www.codefleet.net/
9
  License:
10
 
11
+ Copyright 2015 (kosinix@codefleet.net)
12
 
13
  This program is free software; you can redistribute it and/or modify
14
  it under the terms of the GNU General Public License, version 2, as
43
  function cycloneslider_init() {
44
  global $cyclone_slider_plugin_instance;
45
 
46
+ $plugin = new CycloneSlider_Plugin();
47
 
48
  $plugin['path'] = realpath(plugin_dir_path(__FILE__)) . DIRECTORY_SEPARATOR;
49
  $plugin['url'] = plugin_dir_url(__FILE__);
 
50
  $plugin['debug'] = false;
51
+ $plugin['version'] = '2.9.7';
52
  $plugin['textdomain'] = 'cycloneslider';
53
  $plugin['slug'] = 'cyclone-slider-2/cyclone-slider.php';
54
  $plugin['nonce_name'] = 'cyclone_slider_builder_nonce';
src/CycloneSlider/Admin.php CHANGED
@@ -7,9 +7,7 @@ class CycloneSlider_Admin extends CycloneSlider_Base {
7
  public $slider_count;
8
  protected $message_id;
9
 
10
-
11
- public function bootstrap() {
12
-
13
 
14
  // Set defaults
15
  $this->slider_count = 0;
@@ -56,7 +54,7 @@ class CycloneSlider_Admin extends CycloneSlider_Base {
56
  add_action( 'wp_ajax_cycloneslider_get_video', array( $this, 'cycloneslider_get_video' ) );
57
 
58
 
59
- } // end constructor
60
 
61
  /**
62
  * Add js and css for WP media manager.
@@ -139,9 +137,7 @@ class CycloneSlider_Admin extends CycloneSlider_Base {
139
  7 => __( 'Slideshow saved.', $this->plugin['textdomain'] ),
140
  8 => __( 'Slideshow updated.', $this->plugin['textdomain'] ),
141
  9 => __( 'Slideshow updated.', $this->plugin['textdomain'] ),
142
- 10 => __( 'Slideshow updated.', $this->plugin['textdomain'] ),
143
- 101 => sprintf( __( 'Templates CSS could not be saved. Make sure %stemplates.css is writable.', $this->plugin['textdomain'] ), $this->plugin['path'].'css'.DIRECTORY_SEPARATOR),
144
- 102 => sprintf( __( 'Templates JS could not be saved. Make sure %stemplates.js is writable.', $this->plugin['textdomain'] ), $this->plugin['path'].'js'.DIRECTORY_SEPARATOR)
145
  );
146
  return $messages;
147
  }
7
  public $slider_count;
8
  protected $message_id;
9
 
10
+ public function run() {
 
 
11
 
12
  // Set defaults
13
  $this->slider_count = 0;
54
  add_action( 'wp_ajax_cycloneslider_get_video', array( $this, 'cycloneslider_get_video' ) );
55
 
56
 
57
+ }
58
 
59
  /**
60
  * Add js and css for WP media manager.
137
  7 => __( 'Slideshow saved.', $this->plugin['textdomain'] ),
138
  8 => __( 'Slideshow updated.', $this->plugin['textdomain'] ),
139
  9 => __( 'Slideshow updated.', $this->plugin['textdomain'] ),
140
+ 10 => __( 'Slideshow updated.', $this->plugin['textdomain'] )
 
 
141
  );
142
  return $messages;
143
  }
src/CycloneSlider/AssetLoader.php CHANGED
@@ -2,13 +2,11 @@
2
  /**
3
  * Class for handling styles and scripts
4
  */
5
- class CycloneSlider_AssetLoader {
6
 
7
- protected $plugin;
8
  protected $cyclone_settings_data;
9
 
10
- public function run( $plugin ) {
11
- $this->plugin = $plugin;
12
 
13
  $this->cyclone_settings_data = $this->plugin['settings_page']->get_settings_data();
14
 
2
  /**
3
  * Class for handling styles and scripts
4
  */
5
+ class CycloneSlider_AssetLoader extends CycloneSlider_Base {
6
 
 
7
  protected $cyclone_settings_data;
8
 
9
+ public function run() {
 
10
 
11
  $this->cyclone_settings_data = $this->plugin['settings_page']->get_settings_data();
12
 
src/CycloneSlider/Base.php CHANGED
@@ -2,7 +2,7 @@
2
  abstract class CycloneSlider_Base {
3
  protected $plugin;
4
 
5
- public function run( $plugin ) {
6
  $this->plugin = $plugin;
7
  }
8
  }
2
  abstract class CycloneSlider_Base {
3
  protected $plugin;
4
 
5
+ final public function inject( $plugin ) {
6
  $this->plugin = $plugin;
7
  }
8
  }
src/CycloneSlider/Data.php CHANGED
@@ -2,17 +2,9 @@
2
  /**
3
  * Class for saving and getting slider data
4
  */
5
- class CycloneSlider_Data {
6
 
7
- protected $plugin;
8
-
9
- /**
10
- * Initializes the class
11
- */
12
- public function __construct(){}
13
-
14
- public function run( $plugin ){
15
- $this->plugin = $plugin;
16
 
17
  // Save slides
18
  add_action( 'save_post', array( $this, 'save_slider_post' ) );
2
  /**
3
  * Class for saving and getting slider data
4
  */
5
+ class CycloneSlider_Data extends CycloneSlider_Base {
6
 
7
+ public function run(){
 
 
 
 
 
 
 
 
8
 
9
  // Save slides
10
  add_action( 'save_post', array( $this, 'save_slider_post' ) );
src/CycloneSlider/ExportPage.php CHANGED
@@ -2,11 +2,9 @@
2
  /**
3
  * Class for export page
4
  */
5
- class CycloneSlider_ExportPage {
6
- protected $plugin;
7
 
8
- public function run( $plugin ) {
9
- $this->plugin = $plugin;
10
 
11
  // Add page
12
  add_action( 'admin_menu', array( $this, 'add_menu_and_page'));
2
  /**
3
  * Class for export page
4
  */
5
+ class CycloneSlider_ExportPage extends CycloneSlider_Base {
 
6
 
7
+ public function run() {
 
8
 
9
  // Add page
10
  add_action( 'admin_menu', array( $this, 'add_menu_and_page'));
src/CycloneSlider/Exporter.php CHANGED
@@ -2,13 +2,11 @@
2
  /**
3
  * Class for exporting cyclone-slider.zip
4
  */
5
- class CycloneSlider_Exporter {
6
  protected $log_results; // Hold results of import operations
7
  protected $log_count;
8
- protected $plugin;
9
 
10
- public function run( $plugin ) {
11
- $this->plugin = $plugin;
12
 
13
  $this->log_results = array(
14
  'oks'=>array(),
2
  /**
3
  * Class for exporting cyclone-slider.zip
4
  */
5
+ class CycloneSlider_Exporter extends CycloneSlider_Base {
6
  protected $log_results; // Hold results of import operations
7
  protected $log_count;
 
8
 
9
+ public function run() {
 
10
 
11
  $this->log_results = array(
12
  'oks'=>array(),
src/CycloneSlider/Frontend.php CHANGED
@@ -2,7 +2,7 @@
2
  class CycloneSlider_Frontend extends CycloneSlider_Base {
3
  public $slider_count;
4
 
5
- public function bootstrap() {
6
 
7
  // Set defaults
8
  $this->slider_count = 0;
2
  class CycloneSlider_Frontend extends CycloneSlider_Base {
3
  public $slider_count;
4
 
5
+ public function run() {
6
 
7
  // Set defaults
8
  $this->slider_count = 0;
src/CycloneSlider/ImportPage.php CHANGED
@@ -2,11 +2,9 @@
2
  /**
3
  * Class for import page
4
  */
5
- class CycloneSlider_ImportPage {
6
- protected $plugin;
7
 
8
- public function run( $plugin ) {
9
- $this->plugin = $plugin;
10
 
11
  // Add page
12
  add_action( 'admin_menu', array( $this, 'add_menu_and_page'));
2
  /**
3
  * Class for import page
4
  */
5
+ class CycloneSlider_ImportPage extends CycloneSlider_Base {
 
6
 
7
+ public function run() {
 
8
 
9
  // Add page
10
  add_action( 'admin_menu', array( $this, 'add_menu_and_page'));
src/CycloneSlider/Importer.php CHANGED
@@ -3,13 +3,11 @@
3
  /**
4
  * Class for importing cyclone-slider.zip
5
  */
6
- class CycloneSlider_Importer {
7
  protected $log_results; // Hold results of import operations
8
  protected $log_count;
9
- protected $plugin;
10
 
11
- public function run( $plugin ) {
12
- $this->plugin = $plugin;
13
 
14
  $this->log_results = array(
15
  'oks'=>array(),
3
  /**
4
  * Class for importing cyclone-slider.zip
5
  */
6
+ class CycloneSlider_Importer extends CycloneSlider_Base {
7
  protected $log_results; // Hold results of import operations
8
  protected $log_count;
 
9
 
10
+ public function run() {
 
11
 
12
  $this->log_results = array(
13
  'oks'=>array(),
src/CycloneSlider/Main.php DELETED
@@ -1,64 +0,0 @@
1
- <?php
2
- class CycloneSlider_Main implements ArrayAccess, Iterator {
3
- protected $container;
4
- protected $position;
5
-
6
- public function __construct() {
7
- $this->container = array();
8
- $this->position = 0;
9
- }
10
-
11
- public function run(){
12
- // Loop on contents
13
- foreach($this as $key=>$content){
14
- if( is_object($content) ){
15
- $reflection = new ReflectionClass(get_class($content));
16
- if($reflection->hasMethod('run')){
17
- $content->run( $this ); // Call run method if it is an object with a run method()
18
- if($reflection->hasMethod('bootstrap')){
19
- $content->bootstrap(); // Call run method if it is an object with a bootstrap method()
20
- }
21
- }
22
- }
23
- }
24
- }
25
-
26
- // Array Access
27
- public function offsetSet($offset, $value) {
28
- $this->container[$offset] = $value;
29
- }
30
-
31
- public function offsetExists($offset) {
32
- return isset($this->container[$offset]);
33
- }
34
-
35
- public function offsetUnset($offset) {
36
- unset($this->container[$offset]);
37
- }
38
-
39
- public function offsetGet($offset) {
40
- return isset($this->container[$offset]) ? $this->container[$offset] : null;
41
- }
42
-
43
- // Iterator
44
- public function rewind() {
45
- reset($this->container);
46
- }
47
-
48
- public function current() {
49
- return current($this->container);
50
- }
51
-
52
- public function key() {
53
- return key($this->container);
54
- }
55
-
56
- public function next() {
57
- return next($this->container);
58
- }
59
-
60
- public function valid() {
61
- return key($this->container) !== null;
62
- }
63
-
64
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
src/CycloneSlider/NextgenIntegration.php CHANGED
@@ -2,15 +2,12 @@
2
  /**
3
  * Class for NextGEN integration. Allows import of images from a gallery as new slides.
4
  */
5
- class CycloneSlider_NextgenIntegration {
6
-
7
- protected $plugin;
8
 
9
  /**
10
- * Run
11
  */
12
- function run( $plugin ) {
13
- $this->plugin = $plugin;
14
 
15
  // Add metaboxes
16
  add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 100 );
@@ -167,7 +164,7 @@ class CycloneSlider_NextgenIntegration {
167
 
168
  foreach($nextgen_gallery as $image){
169
  if($attach_id = $this->copy_image($image->imagePath)){ //Copy success!
170
- $slides[] = wp_parse_args(array('id' => $attach_id), $plugin['data']->get_slide_defaults() ); //Add the slide ID and fill in default values
171
  }
172
  }
173
  }
2
  /**
3
  * Class for NextGEN integration. Allows import of images from a gallery as new slides.
4
  */
5
+ class CycloneSlider_NextgenIntegration extends CycloneSlider_Base {
 
 
6
 
7
  /**
8
+ * Boot
9
  */
10
+ function run() {
 
11
 
12
  // Add metaboxes
13
  add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 100 );
164
 
165
  foreach($nextgen_gallery as $image){
166
  if($attach_id = $this->copy_image($image->imagePath)){ //Copy success!
167
+ $slides[] = wp_parse_args(array('id' => $attach_id), $this->plugin['data']->get_slide_defaults() ); //Add the slide ID and fill in default values
168
  }
169
  }
170
  }
src/CycloneSlider/Plugin.php ADDED
@@ -0,0 +1,40 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class CycloneSlider_Plugin implements ArrayAccess {
3
+ protected $contents;
4
+
5
+ public function __construct() {
6
+ $this->contents = array();
7
+ }
8
+
9
+ // ArrayAccess functions
10
+ public function offsetSet($offset, $value) {
11
+ $this->contents[$offset] = $value;
12
+ }
13
+
14
+ public function offsetExists($offset) {
15
+ return isset($this->contents[$offset]);
16
+ }
17
+
18
+ public function offsetUnset($offset) {
19
+ unset($this->contents[$offset]);
20
+ }
21
+
22
+ public function offsetGet($offset) {
23
+ return isset($this->contents[$offset]) ? $this->contents[$offset] : null;
24
+ }
25
+
26
+ public function run(){
27
+ // Loop on contents
28
+ foreach($this->contents as $key=>$content){
29
+ if( is_object($content) ){
30
+ $reflection = new ReflectionClass($content);
31
+ if($reflection->hasMethod('inject')){
32
+ $content->inject( $this ); // Inject our container
33
+ }
34
+ if($reflection->hasMethod('run')){
35
+ $content->run(); // Call run method on object
36
+ }
37
+ }
38
+ }
39
+ }
40
+ }
src/CycloneSlider/SettingsPage.php CHANGED
@@ -5,7 +5,7 @@
5
  class CycloneSlider_SettingsPage extends CycloneSlider_Base {
6
 
7
 
8
- public function bootstrap() {
9
 
10
  // Add settings
11
  add_action( 'admin_init', array( $this, 'register_settings') );
5
  class CycloneSlider_SettingsPage extends CycloneSlider_Base {
6
 
7
 
8
+ public function run() {
9
 
10
  // Add settings
11
  add_action( 'admin_init', array( $this, 'register_settings') );
src/CycloneSlider/TemplatesManager.php CHANGED
@@ -13,7 +13,7 @@ class CycloneSlider_TemplatesManager extends CycloneSlider_Base {
13
  $this->template_locations = array();
14
  }
15
 
16
- public function bootstrap(){
17
  $this->set_template_locations( $this->plugin['templates_locations'] );
18
  }
19
 
13
  $this->template_locations = array();
14
  }
15
 
16
+ public function run(){
17
  $this->set_template_locations( $this->plugin['templates_locations'] );
18
  }
19
 
src/CycloneSlider/Updater.php CHANGED
@@ -9,7 +9,7 @@ class CycloneSlider_Updater extends CycloneSlider_Base {
9
  private $current_version; // Current plugin version to check against
10
  private $info_url; // URL to API endpoint that returns latest plugin version + plugin info
11
 
12
- public function bootstrap(){
13
  $this->settings_data = $this->plugin['settings_page']->get_settings_data();
14
 
15
  $this->plugin_slug = $this->plugin['slug'];
9
  private $current_version; // Current plugin version to check against
10
  private $info_url; // URL to API endpoint that returns latest plugin version + plugin info
11
 
12
+ public function run(){
13
  $this->settings_data = $this->plugin['settings_page']->get_settings_data();
14
 
15
  $this->plugin_slug = $this->plugin['slug'];
src/CycloneSlider/Widgets.php CHANGED
@@ -7,7 +7,7 @@ class CycloneSlider_Widgets extends CycloneSlider_Base {
7
  /**
8
  * Initialize
9
  */
10
- public function bootstrap() {
11
  add_action('widgets_init', array( $this, 'register_widgets') );
12
  }
13
 
7
  /**
8
  * Initialize
9
  */
10
+ public function run() {
11
  add_action('widgets_init', array( $this, 'register_widgets') );
12
  }
13
 
src/CycloneSlider/Youtube.php CHANGED
@@ -4,11 +4,6 @@
4
  */
5
  class CycloneSlider_Youtube {
6
 
7
- /**
8
- * Initialize
9
- */
10
- public function __construct() {} // end constructor
11
-
12
  /**
13
  * Ajax for checking youtube url
14
  *
4
  */
5
  class CycloneSlider_Youtube {
6
 
 
 
 
 
 
7
  /**
8
  * Ajax for checking youtube url
9
  *