Changeset 1329607
- Timestamp:
- 01/16/2016 03:14:19 PM (10 years ago)
- Location:
- chronosly-events-calendar
- Files:
-
- 5 edited
- 13 copied
-
tags/2.3.2 (copied) (copied from chronosly-events-calendar/trunk)
-
tags/2.3.2/README.txt (copied) (copied from chronosly-events-calendar/trunk/README.txt) (1 diff)
-
tags/2.3.2/README.txt~ (copied) (copied from chronosly-events-calendar/trunk/README.txt~) (1 diff)
-
tags/2.3.2/chronosly.php (copied) (copied from chronosly-events-calendar/trunk/chronosly.php) (2 diffs)
-
tags/2.3.2/classes/chronosly_dad_elements.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_dad_elements.php)
-
tags/2.3.2/classes/chronosly_extend.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_extend.php)
-
tags/2.3.2/classes/chronosly_shortcode.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_shortcode.php) (2 diffs)
-
tags/2.3.2/classes/chronosly_templates.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_templates.php)
-
tags/2.3.2/classes/chronosly_widgets.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_widgets.php)
-
tags/2.3.2/custom-templates/dad2/default.html (copied) (copied from chronosly-events-calendar/trunk/custom-templates/dad2/default.html)
-
tags/2.3.2/custom-templates/dad2/default_featured.html (copied) (copied from chronosly-events-calendar/trunk/custom-templates/dad2/default_featured.html)
-
tags/2.3.2/post-types/post_type_chronosly.php (copied) (copied from chronosly-events-calendar/trunk/post-types/post_type_chronosly.php)
-
tags/2.3.2/post-types/post_type_chronosly_calendar.php (copied) (copied from chronosly-events-calendar/trunk/post-types/post_type_chronosly_calendar.php) (9 diffs)
-
trunk/README.txt (modified) (1 diff)
-
trunk/README.txt~ (modified) (1 diff)
-
trunk/chronosly.php (modified) (2 diffs)
-
trunk/classes/chronosly_shortcode.php (modified) (2 diffs)
-
trunk/post-types/post_type_chronosly_calendar.php (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
chronosly-events-calendar/tags/2.3.2/README.txt
r1325241 r1329607 6 6 Requires at least: 3.1 7 7 Tested up to: 4.4.1 8 Stable tag: 2.3. 18 Stable tag: 2.3.2 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/tags/2.3.2/README.txt~
r1325241 r1329607 6 6 Requires at least: 3.1 7 7 Tested up to: 4.4.1 8 Stable tag: 2.3. 08 Stable tag: 2.3.2 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/tags/2.3.2/chronosly.php
r1325241 r1329607 4 4 * Plugin URI: http://www.chronosly.com 5 5 * Description: Chronosly is one of the plugins you have always dreamt about. Designed to suit all users (basic, designers, and software developers). Choose your template and you are ready to publish your events. Install addons to enhance the preset plugin features. You can get a wide selection of templates and addons in our marketplace 6 * Version: 2.3. 16 * Version: 2.3.2 7 7 * Author: Heimsveld IPBN 8 8 * Author URI: http://www.heimsveld.com … … 26 26 define('CHRONOSLY_TEMPLATES_URL', plugins_url()."/chronosly-templates"); //path para incluir scripts o css 27 27 define('CHRONOSLY_DEBUG', false); //debug mode 28 define('CHRONOSLY_VERSION', "2.3. 1"); //debug mode28 define('CHRONOSLY_VERSION', "2.3.2"); //debug mode 29 29 define('CHRONOSLY_ADMIN_INTERFACE', 1); //Todo: hacer diferentes interficies de admin simple o varios event 30 30 define('CHRONOSLY_ADMIN_MODALITY', 1); //Todo: hacer diferentes modalidades segun la tematica -
chronosly-events-calendar/tags/2.3.2/classes/chronosly_shortcode.php
r1316864 r1329607 105 105 106 106 } 107 if( $code["show_past"]or class_exists("Chronosly_Tickets_and_Repeats_Extended") ){107 if(isset($code["show_past"]) or class_exists("Chronosly_Tickets_and_Repeats_Extended") ){ 108 108 //show event list for day 109 109 //$code["type"] = "event"; 110 $_REQUEST["ch_show_past"] = 1; 110 if($code["show_past"] or class_exists("Chronosly_Tickets_and_Repeats_Extended") ) $_REQUEST["ch_show_past"] = 1; 111 else $_REQUEST["ch_show_past"] = 0; 111 112 112 113 } … … 161 162 $pastformat = 1; 162 163 $_REQUEST["ch_show_past"] = 1; 163 164 164 } 165 165 $_REQUEST["shortcode"] = 1; -
chronosly-events-calendar/tags/2.3.2/post-types/post_type_chronosly_calendar.php
r1316864 r1329607 260 260 $tickets = array(); 261 261 if( isset($meta["tickets"][0])) $tickets = json_decode($meta["tickets"][0]); 262 $elements = Post_Type_Chronosly_Calendar::seasons($eventos, $year, $month, $week, $start_ini, $end, get_the_ID(), $elements, $tickets);262 $elements = Post_Type_Chronosly_Calendar::seasons($eventos, $year, $month, $week, $start_ini, $end, get_the_ID(), $elements,$tickets); 263 263 } 264 264 else if(isset($meta["ev-from"][0])){ 265 265 //si empieza en el mismo año y week que el calendario debemos empezar en el dia especifico 266 if($settings["chronosly_week_start"] == 1) {266 if($settings["chronosly_week_start"] == 1) { 267 267 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24); 268 $top = strtotime("+ 6days", $botom);268 $top = strtotime("+7 days", $botom); 269 269 } else { 270 270 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 271 $top = strtotime("+ 6days", $botom);271 $top = strtotime("+7 days", $botom); 272 272 } 273 273 274 if(strtotime($meta["ev-from"][0]) >= $botom 274 275 and strtotime($meta["ev-from"][0]) <= $top){ … … 311 312 312 313 $meta = get_post_meta(get_the_ID()); 314 313 315 314 316 if(isset($meta["events"][0]) and $meta["events"][0]) { … … 316 318 $tickets = array(); 317 319 if( isset($meta["tickets"][0])) $tickets = json_decode($meta["tickets"][0]); 318 $elements = Post_Type_Chronosly_Calendar::seasons($eventos, $year, $month, $week, $start_ini, $end, get_the_ID(), $elements, $tickets);320 $elements = Post_Type_Chronosly_Calendar::seasons($eventos, $year, $month, $week, $start_ini, $end, get_the_ID(), $elements,$tickets); 319 321 } 320 322 else if(isset($meta["ev-from"][0])){ … … 444 446 } else if($week){ 445 447 446 447 448 $st1 = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 448 449 if($repeated) $start_min = $st1;//start building array 449 $end_top = strtotime("+ 6days", $st1);//limit of repeats per week450 $end_top = strtotime("+7 days", $st1);//limit of repeats per week 450 451 451 452 … … 556 557 } 557 558 558 public static function seasons($eventos, $year, $month, $week, $start, $end, $id, $elements, $tickets){559 public static function seasons($eventos, $year, $month, $week, $start, $end, $id, $elements, $tickets){ 559 560 $settings = unserialize(get_option("chronosly-settings")); 560 // print_r($eventos); 561 562 // print_r($tickets); 561 563 foreach($eventos as $evento){ 562 564 $from = strtotime(substr($evento->start, 0, stripos($evento->start, "+")-1)); 563 565 $to = strtotime(substr($evento->end, 0, stripos( $evento->end, "+")-1)); 564 565 566 if($_REQUEST["ch-price-min"]){ 566 567 if(!isset($evento->tickets)) continue; … … 598 599 if(!$tick) continue; 599 600 } 600 601 // print_r($evento); 601 602 if(date('Y-m-d',$from) != date('Y-m-d',$to)) $to -= 60*60*24; 602 603 … … 634 635 635 636 //si empieza en el mismo año y week que el calendario debemos empezar en el dia especifico 636 if($settings["chronosly_week_start"] == 1) { 637 // if($settings["chronosly_week_start"] == 1) { 638 // $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24); 639 // $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT))-(1*60*60*24); 640 // } else { 641 // $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 642 // $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT)); 643 644 // } 645 if($settings["chronosly_week_start"] == 1) { 637 646 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24); 638 $top = strtotime("+ 6days", $botom);647 $top = strtotime("+7 days", $botom); 639 648 } else { 640 649 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 641 $top = strtotime("+ 6days", $botom);650 $top = strtotime("+7 days", $botom); 642 651 } 652 // echo "$botom $top<br/>"; 643 653 if($from >= $botom 644 654 and $from <= $top){ … … 689 699 // echo date("Y-m", $from); 690 700 // echo date("Y-m", strtotime($year."-".$month)); 701 691 702 do{ 692 703 $elements["days"][date('Y-m-d',$start)][$pos]=array("id" => $id,"start" => $start_ini, "end" => $end , "h" => date("H", $from), "m"=> date("i", $from), "eh" => date("H", $to), "em"=> date("i", $to)); … … 854 865 855 866 } 856 if( $_REQUEST["event_name"]) { 867 868 if( $_REQUEST["event_name"]) { 857 869 $args['post_title_like'] =$_REQUEST["event_name"]; 858 870 } 871 859 872 if ( is_user_logged_in() ) $args["post_status"] = array('publish', 'private'); 860 873 -
chronosly-events-calendar/trunk/README.txt
r1325241 r1329607 6 6 Requires at least: 3.1 7 7 Tested up to: 4.4.1 8 Stable tag: 2.3. 18 Stable tag: 2.3.2 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/trunk/README.txt~
r1325241 r1329607 6 6 Requires at least: 3.1 7 7 Tested up to: 4.4.1 8 Stable tag: 2.3. 08 Stable tag: 2.3.2 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/trunk/chronosly.php
r1325241 r1329607 4 4 * Plugin URI: http://www.chronosly.com 5 5 * Description: Chronosly is one of the plugins you have always dreamt about. Designed to suit all users (basic, designers, and software developers). Choose your template and you are ready to publish your events. Install addons to enhance the preset plugin features. You can get a wide selection of templates and addons in our marketplace 6 * Version: 2.3. 16 * Version: 2.3.2 7 7 * Author: Heimsveld IPBN 8 8 * Author URI: http://www.heimsveld.com … … 26 26 define('CHRONOSLY_TEMPLATES_URL', plugins_url()."/chronosly-templates"); //path para incluir scripts o css 27 27 define('CHRONOSLY_DEBUG', false); //debug mode 28 define('CHRONOSLY_VERSION', "2.3. 1"); //debug mode28 define('CHRONOSLY_VERSION', "2.3.2"); //debug mode 29 29 define('CHRONOSLY_ADMIN_INTERFACE', 1); //Todo: hacer diferentes interficies de admin simple o varios event 30 30 define('CHRONOSLY_ADMIN_MODALITY', 1); //Todo: hacer diferentes modalidades segun la tematica -
chronosly-events-calendar/trunk/classes/chronosly_shortcode.php
r1316864 r1329607 105 105 106 106 } 107 if( $code["show_past"]or class_exists("Chronosly_Tickets_and_Repeats_Extended") ){107 if(isset($code["show_past"]) or class_exists("Chronosly_Tickets_and_Repeats_Extended") ){ 108 108 //show event list for day 109 109 //$code["type"] = "event"; 110 $_REQUEST["ch_show_past"] = 1; 110 if($code["show_past"] or class_exists("Chronosly_Tickets_and_Repeats_Extended") ) $_REQUEST["ch_show_past"] = 1; 111 else $_REQUEST["ch_show_past"] = 0; 111 112 112 113 } … … 161 162 $pastformat = 1; 162 163 $_REQUEST["ch_show_past"] = 1; 163 164 164 } 165 165 $_REQUEST["shortcode"] = 1; -
chronosly-events-calendar/trunk/post-types/post_type_chronosly_calendar.php
r1316864 r1329607 260 260 $tickets = array(); 261 261 if( isset($meta["tickets"][0])) $tickets = json_decode($meta["tickets"][0]); 262 $elements = Post_Type_Chronosly_Calendar::seasons($eventos, $year, $month, $week, $start_ini, $end, get_the_ID(), $elements, $tickets);262 $elements = Post_Type_Chronosly_Calendar::seasons($eventos, $year, $month, $week, $start_ini, $end, get_the_ID(), $elements,$tickets); 263 263 } 264 264 else if(isset($meta["ev-from"][0])){ 265 265 //si empieza en el mismo año y week que el calendario debemos empezar en el dia especifico 266 if($settings["chronosly_week_start"] == 1) {266 if($settings["chronosly_week_start"] == 1) { 267 267 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24); 268 $top = strtotime("+ 6days", $botom);268 $top = strtotime("+7 days", $botom); 269 269 } else { 270 270 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 271 $top = strtotime("+ 6days", $botom);271 $top = strtotime("+7 days", $botom); 272 272 } 273 273 274 if(strtotime($meta["ev-from"][0]) >= $botom 274 275 and strtotime($meta["ev-from"][0]) <= $top){ … … 311 312 312 313 $meta = get_post_meta(get_the_ID()); 314 313 315 314 316 if(isset($meta["events"][0]) and $meta["events"][0]) { … … 316 318 $tickets = array(); 317 319 if( isset($meta["tickets"][0])) $tickets = json_decode($meta["tickets"][0]); 318 $elements = Post_Type_Chronosly_Calendar::seasons($eventos, $year, $month, $week, $start_ini, $end, get_the_ID(), $elements, $tickets);320 $elements = Post_Type_Chronosly_Calendar::seasons($eventos, $year, $month, $week, $start_ini, $end, get_the_ID(), $elements,$tickets); 319 321 } 320 322 else if(isset($meta["ev-from"][0])){ … … 444 446 } else if($week){ 445 447 446 447 448 $st1 = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 448 449 if($repeated) $start_min = $st1;//start building array 449 $end_top = strtotime("+ 6days", $st1);//limit of repeats per week450 $end_top = strtotime("+7 days", $st1);//limit of repeats per week 450 451 451 452 … … 556 557 } 557 558 558 public static function seasons($eventos, $year, $month, $week, $start, $end, $id, $elements, $tickets){559 public static function seasons($eventos, $year, $month, $week, $start, $end, $id, $elements, $tickets){ 559 560 $settings = unserialize(get_option("chronosly-settings")); 560 // print_r($eventos); 561 562 // print_r($tickets); 561 563 foreach($eventos as $evento){ 562 564 $from = strtotime(substr($evento->start, 0, stripos($evento->start, "+")-1)); 563 565 $to = strtotime(substr($evento->end, 0, stripos( $evento->end, "+")-1)); 564 565 566 if($_REQUEST["ch-price-min"]){ 566 567 if(!isset($evento->tickets)) continue; … … 598 599 if(!$tick) continue; 599 600 } 600 601 // print_r($evento); 601 602 if(date('Y-m-d',$from) != date('Y-m-d',$to)) $to -= 60*60*24; 602 603 … … 634 635 635 636 //si empieza en el mismo año y week que el calendario debemos empezar en el dia especifico 636 if($settings["chronosly_week_start"] == 1) { 637 // if($settings["chronosly_week_start"] == 1) { 638 // $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24); 639 // $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT))-(1*60*60*24); 640 // } else { 641 // $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 642 // $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT)); 643 644 // } 645 if($settings["chronosly_week_start"] == 1) { 637 646 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24); 638 $top = strtotime("+ 6days", $botom);647 $top = strtotime("+7 days", $botom); 639 648 } else { 640 649 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 641 $top = strtotime("+ 6days", $botom);650 $top = strtotime("+7 days", $botom); 642 651 } 652 // echo "$botom $top<br/>"; 643 653 if($from >= $botom 644 654 and $from <= $top){ … … 689 699 // echo date("Y-m", $from); 690 700 // echo date("Y-m", strtotime($year."-".$month)); 701 691 702 do{ 692 703 $elements["days"][date('Y-m-d',$start)][$pos]=array("id" => $id,"start" => $start_ini, "end" => $end , "h" => date("H", $from), "m"=> date("i", $from), "eh" => date("H", $to), "em"=> date("i", $to)); … … 854 865 855 866 } 856 if( $_REQUEST["event_name"]) { 867 868 if( $_REQUEST["event_name"]) { 857 869 $args['post_title_like'] =$_REQUEST["event_name"]; 858 870 } 871 859 872 if ( is_user_logged_in() ) $args["post_status"] = array('publish', 'private'); 860 873
Note: See TracChangeset
for help on using the changeset viewer.