Changeset 1316864
- Timestamp:
- 12/27/2015 01:19:52 PM (10 years ago)
- Location:
- chronosly-events-calendar
- Files:
-
- 11 edited
- 10 copied
-
tags/2.3.0 (copied) (copied from chronosly-events-calendar/trunk)
-
tags/2.3.0/README.txt (copied) (copied from chronosly-events-calendar/trunk/README.txt) (1 diff)
-
tags/2.3.0/README.txt~ (copied) (copied from chronosly-events-calendar/trunk/README.txt~)
-
tags/2.3.0/chronosly.php (copied) (copied from chronosly-events-calendar/trunk/chronosly.php) (3 diffs)
-
tags/2.3.0/classes/chronosly_dad_elements.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_dad_elements.php)
-
tags/2.3.0/classes/chronosly_extend.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_extend.php) (1 diff)
-
tags/2.3.0/classes/chronosly_shortcode.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_shortcode.php) (10 diffs)
-
tags/2.3.0/classes/chronosly_templates.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_templates.php) (2 diffs)
-
tags/2.3.0/classes/chronosly_widgets.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_widgets.php)
-
tags/2.3.0/custom-templates/dad2/default.html (modified) (1 diff)
-
tags/2.3.0/custom-templates/dad2/default_featured.html (modified) (1 diff)
-
tags/2.3.0/post-types/post_type_chronosly.php (copied) (copied from chronosly-events-calendar/trunk/post-types/post_type_chronosly.php)
-
tags/2.3.0/post-types/post_type_chronosly_calendar.php (modified) (3 diffs)
-
trunk/README.txt (modified) (1 diff)
-
trunk/chronosly.php (modified) (3 diffs)
-
trunk/classes/chronosly_extend.php (modified) (1 diff)
-
trunk/classes/chronosly_shortcode.php (modified) (10 diffs)
-
trunk/classes/chronosly_templates.php (modified) (2 diffs)
-
trunk/custom-templates/dad2/default.html (modified) (1 diff)
-
trunk/custom-templates/dad2/default_featured.html (modified) (1 diff)
-
trunk/post-types/post_type_chronosly_calendar.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
chronosly-events-calendar/tags/2.3.0/README.txt
r1301303 r1316864 5 5 Tags: calendar, calendars, event plugin, events plugin, event plugins, events plugins, event calendar, event calendars, events calendar, events calendars, event list, events list, event lists, events lists, online calendar, organizer, organizers, place, places, recurring events, responsive calendar, calendar shortcode, event shortcode, event calendar AJAX, events calendar AJAX, event calendars AJAX, events calendars AJAX, events calendars google map, event calendar google maps, events calendar google maps, event calendars google maps, events calendars google maps, event gmap, events gmap, event management, events management, event manager, events manager, event organizer, events organizer, event page, events page, event widget, events widget, kalender, kalenders, evento, eventos, calendario, calendarios, schedule, scheduling 6 6 Requires at least: 3.1 7 Tested up to: 4.3.18 Stable tag: 2. 2.87 Tested up to: 4.4.1 8 Stable tag: 2.3.0 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/tags/2.3.0/chronosly.php
r1301303 r1316864 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. 2.86 * Version: 2.3.0 7 7 * Author: Heimsveld IPBN 8 8 * Author URI: http://www.heimsveld.com 9 9 * Requires at least: 3.1 10 * Tested up to: 4. 3.110 * Tested up to: 4.4.1 11 11 * 12 12 * Text Domain: chronosly … … 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. 2.8"); //debug mode28 define('CHRONOSLY_VERSION', "2.3.0"); //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 31 define("CHRONOSLY_ADMIN_ROLE", 'administrator'); //role del admin32 31 define("CHRONOSLY_CAPABILITY_TYPE", 'chronosly'); //capability 33 32 define("CHRONOSLY_TEMPLATES_PATH", WP_PLUGIN_DIR."/chronosly-templates"); //path de los templates … … 166 165 'chronosly_license' 167 166 ) as $cap){ 168 $WP_Roles->add_cap( CHRONOSLY_ADMIN_ROLE, $cap ); 167 $WP_Roles->add_cap( "administrator", $cap ); 168 $WP_Roles->add_cap( "editor", $cap ); 169 169 } 170 170 -
chronosly-events-calendar/tags/2.3.0/classes/chronosly_extend.php
r1301303 r1316864 305 305 // return; 306 306 //save the zip temporaly 307 307 308 if($cont["error"]) return 0; 308 309 $zip = $cont["content"]; -
chronosly-events-calendar/tags/2.3.0/classes/chronosly_shortcode.php
r1301303 r1316864 37 37 $settings = unserialize(get_option("chronosly-settings")); 38 38 $args = array( 39 'type' => 'calendar',//type: allowed calendar, event, organizer, place, category 39 'type' => 'calendar',//type: allowed calendar, event, organizer, place, category, map_navigation 40 40 "upcoming" => 0, //upcoming: days for upcoming events 41 41 "year" => 0,//year: for filtering calendar and event … … 63 63 64 64 $code = apply_filters("chronosly-shortcode-extra-params-run", $code); 65 // print_r($code); 65 66 //print_r($code); 66 67 $_REQUEST["small"] = $code["small"]; … … 92 93 if($code["day"]){ 93 94 //show event list for day 94 if($code["type"] != "category") $code["type"] = "event";95 // if($code["type"] != "category") $code["type"] = "event"; 95 96 $_REQUEST["chronosly_event_list_format"] = "day"; 96 97 $_REQUEST["chronosly_event_list_time"] = $code["day"]; … … 121 122 $_REQUEST["ch_code"] = json_encode($atts); 122 123 123 //echo $_REQUEST["ch_code"];124 // echo $_REQUEST["ch_code"]; 124 125 ob_start(); 125 126 126 127 $this->run_templates($code["type"], $code); 127 128 $content = ob_get_clean(); 128 $_REQUEST["chronosly_event_list_format"] = ""; 129 $_REQUEST["chronosly_event_list_time"] = ""; 130 $_REQUEST["y"] = ""; 131 $_REQUEST["mo"] = ""; 132 $_REQUEST["week"] = ""; 133 $_REQUEST["count"] = ""; 134 $_REQUEST["category"] = ""; 135 $_REQUEST["organizer"] = ""; 136 $_REQUEST["place"] = ""; 137 $_REQUEST["small"] = ""; 138 $_REQUEST["pagination"] = ""; 139 $_REQUEST["ch_code"] = ""; 140 $_REQUEST["force_template"] = ""; 129 unset($_REQUEST["chronosly_event_list_format"]); 130 unset($_REQUEST["chronosly_event_list_time"]); 131 unset($_REQUEST["y"]); 132 unset($_REQUEST["mo"]); 133 unset($_REQUEST["week"]); 134 unset($_REQUEST["count"]); 135 unset($_REQUEST["category"]); 136 unset($_REQUEST["organizer"]); 137 unset($_REQUEST["place"]); 138 unset($_REQUEST["small"]); 139 unset($_REQUEST["pagination"]); 140 unset($_REQUEST["ch_code"]); 141 unset($_REQUEST["force_template"]); 142 unset($_REQUEST["ch_show_past"]); 143 unset($_REQUEST["navigation"]); 144 unset($_REQUEST["before_events"]); 145 unset($_REQUEST["after_events"]); 146 unset($_REQUEST["featured"]); 147 unset($_REQUEST["ch-price-min"]); 148 unset($_REQUEST["ch-price-max"]); 141 149 return $content; 142 150 … … 152 160 if(isset($_REQUEST["chronosly_event_list_time"]) and $_REQUEST["chronosly_event_list_time"] == "past"){ 153 161 $pastformat = 1; 162 $_REQUEST["ch_show_past"] = 1; 163 154 164 } 155 165 $_REQUEST["shortcode"] = 1; 156 166 $q = array(); 157 167 if($args["id"]) { 158 $q["post__in"] = explode(",", $args["id"]);168 $q["post__in"] = explode(",", $args["id"]); 159 169 160 170 } … … 193 203 $_REQUEST['pagination']= 1; 194 204 } 195 if(isset($_REQUEST["page"])) { 196 //$q['posts_per_page']=$args["count"];197 $q['paged'] =$_REQUEST['page'];198 }199 205 206 if($_REQUEST["page"]) { 207 //$q['posts_per_page']=$args["count"]; 208 $q['paged'] =$_REQUEST['page']; 209 } 200 210 if($args["before_events"]) { 201 211 $_REQUEST["before_events"] = 1; … … 205 215 } 206 216 if($args["featured"]) { 207 if($args["featured"] == "yes" || $args["featured"] == "1") $feat = 1;217 if($args["featured"] == "yes" || $args["featured"] == "1") $feat = 1; 208 218 else $feat = ""; 209 219 $q['post_meta_like']["featured"] = $feat; … … 220 230 221 231 if ( is_user_logged_in() )$q["post_status"] = array('publish', 'private'); 222 223 232 switch($type){ 224 233 case "calendar": 225 226 if ( is_user_logged_in() ) new WP_Query("post_type=chronosly_calendar&post_status=publish,private");234 235 if ( is_user_logged_in() ) new WP_Query("post_type=chronosly_calendar&post_status=publish,private"); 227 236 else $wp_query = new WP_Query("post_type=chronosly_calendar"); 228 237 … … 244 253 $q["posts_per_page"]=-1; 245 254 $wp_query = new WP_Query($q); 255 // echo "<pre>";print_r($wp_query); 246 256 include(Post_Type_Chronosly::chronosly_templates("shortcode_events")); 247 257 … … 265 275 266 276 break; 267 case "map_format":277 case "map_format": 268 278 // print_r($args); 269 279 add_action( 'pre_get_posts', array("Post_Type_Chronosly",'add_custom_post_vars') ); -
chronosly-events-calendar/tags/2.3.0/classes/chronosly_templates.php
r1286972 r1316864 576 576 "₵","₶","₷","₸","₹","¥","֏","৲","৳", 577 577 "૱","௹","฿","៛","㍐","元","円","圆","圎","圓","꠸","원", 578 "﷼","¥","₩", "CHF" 578 "﷼","¥","₩", "CHF", "Руб" 579 579 ); 580 580 $settings = unserialize(get_option("chronosly-settings")); … … 687 687 688 688 //retrieve template vars from file 689 private function get_template_vars($file){689 private function get_template_vars($file){ 690 690 $f = @fopen($file, "r"); 691 $content =str_replace(array('\\"', "\\'"), array('"',"'"),@fread($f, filesize($file))); 691 $content =str_replace(array('\\"', "\\'"), "'",@fread($f, filesize($file))); 692 if(!json_decode(stripslashes($content))) { 693 @fclose($f); 694 $f = @fopen($file, "r"); 695 $content =str_replace(array('\\"', "\\'"), array('"',"'"),@fread($f, filesize($file))); 696 } 697 692 698 @fclose($f); 693 699 //no chuta el json decode, hay que mirar 700 694 701 return json_decode(stripslashes($content)); 695 702 //print_r($this->vars); -
chronosly-events-calendar/tags/2.3.0/custom-templates/dad2/default.html
r1256000 r1316864 53 53 <div class='ch-clear'></div> 54 54 </div> 55 <div class='ev-item custom_code' style=''> 56 <div class='ev-data custom_code'> 57 {{ translate | Insert shortcode}} 58 </div> 59 60 <div class='ch-clear'></div> 61 </div> 55 62 56 <div class="ch-clear"></div> 63 57 </div> -
chronosly-events-calendar/tags/2.3.0/custom-templates/dad2/default_featured.html
r1256000 r1316864 53 53 <div class='ch-clear'></div> 54 54 </div> 55 <div class='ev-item custom_code' style=''> 56 <div class='ev-data custom_code'> 57 {{ translate | Insert shortcode}} 58 </div> 59 60 <div class='ch-clear'></div> 61 </div> 55 62 56 <div class="ch-clear"></div> 63 57 </div> -
chronosly-events-calendar/tags/2.3.0/post-types/post_type_chronosly_calendar.php
r1272735 r1316864 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( $year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT))-(2*60*60*24);268 $top = strtotime("+6 days", $botom); 269 269 } else { 270 270 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 271 $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT))-(60*60*24);271 $top = strtotime("+6 days", $botom); 272 272 } 273 273 if(strtotime($meta["ev-from"][0]) >= $botom … … 445 445 446 446 447 if($repeated) $start_min = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT));//start building array 448 $end_top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT)." -1 day");//limit of repeats per week 447 $st1 = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 448 if($repeated) $start_min = $st1;//start building array 449 $end_top = strtotime("+6 days", $st1);//limit of repeats per week 449 450 450 451 … … 633 634 634 635 //si empieza en el mismo año y week que el calendario debemos empezar en el dia especifico 635 if($settings["chronosly_week_start"] == 1) {636 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24);637 $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT))-(1*60*60*24);638 } else {639 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT));640 $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT));641 }636 if($settings["chronosly_week_start"] == 1) { 637 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24); 638 $top = strtotime("+6 days", $botom); 639 } else { 640 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 641 $top = strtotime("+6 days", $botom); 642 } 642 643 if($from >= $botom 643 644 and $from <= $top){ -
chronosly-events-calendar/trunk/README.txt
r1301303 r1316864 5 5 Tags: calendar, calendars, event plugin, events plugin, event plugins, events plugins, event calendar, event calendars, events calendar, events calendars, event list, events list, event lists, events lists, online calendar, organizer, organizers, place, places, recurring events, responsive calendar, calendar shortcode, event shortcode, event calendar AJAX, events calendar AJAX, event calendars AJAX, events calendars AJAX, events calendars google map, event calendar google maps, events calendar google maps, event calendars google maps, events calendars google maps, event gmap, events gmap, event management, events management, event manager, events manager, event organizer, events organizer, event page, events page, event widget, events widget, kalender, kalenders, evento, eventos, calendario, calendarios, schedule, scheduling 6 6 Requires at least: 3.1 7 Tested up to: 4.3.18 Stable tag: 2. 2.87 Tested up to: 4.4.1 8 Stable tag: 2.3.0 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/trunk/chronosly.php
r1301303 r1316864 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. 2.86 * Version: 2.3.0 7 7 * Author: Heimsveld IPBN 8 8 * Author URI: http://www.heimsveld.com 9 9 * Requires at least: 3.1 10 * Tested up to: 4. 3.110 * Tested up to: 4.4.1 11 11 * 12 12 * Text Domain: chronosly … … 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. 2.8"); //debug mode28 define('CHRONOSLY_VERSION', "2.3.0"); //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 31 define("CHRONOSLY_ADMIN_ROLE", 'administrator'); //role del admin32 31 define("CHRONOSLY_CAPABILITY_TYPE", 'chronosly'); //capability 33 32 define("CHRONOSLY_TEMPLATES_PATH", WP_PLUGIN_DIR."/chronosly-templates"); //path de los templates … … 166 165 'chronosly_license' 167 166 ) as $cap){ 168 $WP_Roles->add_cap( CHRONOSLY_ADMIN_ROLE, $cap ); 167 $WP_Roles->add_cap( "administrator", $cap ); 168 $WP_Roles->add_cap( "editor", $cap ); 169 169 } 170 170 -
chronosly-events-calendar/trunk/classes/chronosly_extend.php
r1301303 r1316864 305 305 // return; 306 306 //save the zip temporaly 307 307 308 if($cont["error"]) return 0; 308 309 $zip = $cont["content"]; -
chronosly-events-calendar/trunk/classes/chronosly_shortcode.php
r1301303 r1316864 37 37 $settings = unserialize(get_option("chronosly-settings")); 38 38 $args = array( 39 'type' => 'calendar',//type: allowed calendar, event, organizer, place, category 39 'type' => 'calendar',//type: allowed calendar, event, organizer, place, category, map_navigation 40 40 "upcoming" => 0, //upcoming: days for upcoming events 41 41 "year" => 0,//year: for filtering calendar and event … … 63 63 64 64 $code = apply_filters("chronosly-shortcode-extra-params-run", $code); 65 // print_r($code); 65 66 //print_r($code); 66 67 $_REQUEST["small"] = $code["small"]; … … 92 93 if($code["day"]){ 93 94 //show event list for day 94 if($code["type"] != "category") $code["type"] = "event";95 // if($code["type"] != "category") $code["type"] = "event"; 95 96 $_REQUEST["chronosly_event_list_format"] = "day"; 96 97 $_REQUEST["chronosly_event_list_time"] = $code["day"]; … … 121 122 $_REQUEST["ch_code"] = json_encode($atts); 122 123 123 //echo $_REQUEST["ch_code"];124 // echo $_REQUEST["ch_code"]; 124 125 ob_start(); 125 126 126 127 $this->run_templates($code["type"], $code); 127 128 $content = ob_get_clean(); 128 $_REQUEST["chronosly_event_list_format"] = ""; 129 $_REQUEST["chronosly_event_list_time"] = ""; 130 $_REQUEST["y"] = ""; 131 $_REQUEST["mo"] = ""; 132 $_REQUEST["week"] = ""; 133 $_REQUEST["count"] = ""; 134 $_REQUEST["category"] = ""; 135 $_REQUEST["organizer"] = ""; 136 $_REQUEST["place"] = ""; 137 $_REQUEST["small"] = ""; 138 $_REQUEST["pagination"] = ""; 139 $_REQUEST["ch_code"] = ""; 140 $_REQUEST["force_template"] = ""; 129 unset($_REQUEST["chronosly_event_list_format"]); 130 unset($_REQUEST["chronosly_event_list_time"]); 131 unset($_REQUEST["y"]); 132 unset($_REQUEST["mo"]); 133 unset($_REQUEST["week"]); 134 unset($_REQUEST["count"]); 135 unset($_REQUEST["category"]); 136 unset($_REQUEST["organizer"]); 137 unset($_REQUEST["place"]); 138 unset($_REQUEST["small"]); 139 unset($_REQUEST["pagination"]); 140 unset($_REQUEST["ch_code"]); 141 unset($_REQUEST["force_template"]); 142 unset($_REQUEST["ch_show_past"]); 143 unset($_REQUEST["navigation"]); 144 unset($_REQUEST["before_events"]); 145 unset($_REQUEST["after_events"]); 146 unset($_REQUEST["featured"]); 147 unset($_REQUEST["ch-price-min"]); 148 unset($_REQUEST["ch-price-max"]); 141 149 return $content; 142 150 … … 152 160 if(isset($_REQUEST["chronosly_event_list_time"]) and $_REQUEST["chronosly_event_list_time"] == "past"){ 153 161 $pastformat = 1; 162 $_REQUEST["ch_show_past"] = 1; 163 154 164 } 155 165 $_REQUEST["shortcode"] = 1; 156 166 $q = array(); 157 167 if($args["id"]) { 158 $q["post__in"] = explode(",", $args["id"]);168 $q["post__in"] = explode(",", $args["id"]); 159 169 160 170 } … … 193 203 $_REQUEST['pagination']= 1; 194 204 } 195 if(isset($_REQUEST["page"])) { 196 //$q['posts_per_page']=$args["count"];197 $q['paged'] =$_REQUEST['page'];198 }199 205 206 if($_REQUEST["page"]) { 207 //$q['posts_per_page']=$args["count"]; 208 $q['paged'] =$_REQUEST['page']; 209 } 200 210 if($args["before_events"]) { 201 211 $_REQUEST["before_events"] = 1; … … 205 215 } 206 216 if($args["featured"]) { 207 if($args["featured"] == "yes" || $args["featured"] == "1") $feat = 1;217 if($args["featured"] == "yes" || $args["featured"] == "1") $feat = 1; 208 218 else $feat = ""; 209 219 $q['post_meta_like']["featured"] = $feat; … … 220 230 221 231 if ( is_user_logged_in() )$q["post_status"] = array('publish', 'private'); 222 223 232 switch($type){ 224 233 case "calendar": 225 226 if ( is_user_logged_in() ) new WP_Query("post_type=chronosly_calendar&post_status=publish,private");234 235 if ( is_user_logged_in() ) new WP_Query("post_type=chronosly_calendar&post_status=publish,private"); 227 236 else $wp_query = new WP_Query("post_type=chronosly_calendar"); 228 237 … … 244 253 $q["posts_per_page"]=-1; 245 254 $wp_query = new WP_Query($q); 255 // echo "<pre>";print_r($wp_query); 246 256 include(Post_Type_Chronosly::chronosly_templates("shortcode_events")); 247 257 … … 265 275 266 276 break; 267 case "map_format":277 case "map_format": 268 278 // print_r($args); 269 279 add_action( 'pre_get_posts', array("Post_Type_Chronosly",'add_custom_post_vars') ); -
chronosly-events-calendar/trunk/classes/chronosly_templates.php
r1286972 r1316864 576 576 "₵","₶","₷","₸","₹","¥","֏","৲","৳", 577 577 "૱","௹","฿","៛","㍐","元","円","圆","圎","圓","꠸","원", 578 "﷼","¥","₩", "CHF" 578 "﷼","¥","₩", "CHF", "Руб" 579 579 ); 580 580 $settings = unserialize(get_option("chronosly-settings")); … … 687 687 688 688 //retrieve template vars from file 689 private function get_template_vars($file){689 private function get_template_vars($file){ 690 690 $f = @fopen($file, "r"); 691 $content =str_replace(array('\\"', "\\'"), array('"',"'"),@fread($f, filesize($file))); 691 $content =str_replace(array('\\"', "\\'"), "'",@fread($f, filesize($file))); 692 if(!json_decode(stripslashes($content))) { 693 @fclose($f); 694 $f = @fopen($file, "r"); 695 $content =str_replace(array('\\"', "\\'"), array('"',"'"),@fread($f, filesize($file))); 696 } 697 692 698 @fclose($f); 693 699 //no chuta el json decode, hay que mirar 700 694 701 return json_decode(stripslashes($content)); 695 702 //print_r($this->vars); -
chronosly-events-calendar/trunk/custom-templates/dad2/default.html
r1256000 r1316864 53 53 <div class='ch-clear'></div> 54 54 </div> 55 <div class='ev-item custom_code' style=''> 56 <div class='ev-data custom_code'> 57 {{ translate | Insert shortcode}} 58 </div> 59 60 <div class='ch-clear'></div> 61 </div> 55 62 56 <div class="ch-clear"></div> 63 57 </div> -
chronosly-events-calendar/trunk/custom-templates/dad2/default_featured.html
r1256000 r1316864 53 53 <div class='ch-clear'></div> 54 54 </div> 55 <div class='ev-item custom_code' style=''> 56 <div class='ev-data custom_code'> 57 {{ translate | Insert shortcode}} 58 </div> 59 60 <div class='ch-clear'></div> 61 </div> 55 62 56 <div class="ch-clear"></div> 63 57 </div> -
chronosly-events-calendar/trunk/post-types/post_type_chronosly_calendar.php
r1272735 r1316864 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( $year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT))-(2*60*60*24);268 $top = strtotime("+6 days", $botom); 269 269 } else { 270 270 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 271 $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT))-(60*60*24);271 $top = strtotime("+6 days", $botom); 272 272 } 273 273 if(strtotime($meta["ev-from"][0]) >= $botom … … 445 445 446 446 447 if($repeated) $start_min = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT));//start building array 448 $end_top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT)." -1 day");//limit of repeats per week 447 $st1 = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 448 if($repeated) $start_min = $st1;//start building array 449 $end_top = strtotime("+6 days", $st1);//limit of repeats per week 449 450 450 451 … … 633 634 634 635 //si empieza en el mismo año y week que el calendario debemos empezar en el dia especifico 635 if($settings["chronosly_week_start"] == 1) {636 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24);637 $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT))-(1*60*60*24);638 } else {639 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT));640 $top = strtotime($year."W".str_pad($week+1, 2, '0', STR_PAD_LEFT));641 }636 if($settings["chronosly_week_start"] == 1) { 637 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT))-(60*60*24); 638 $top = strtotime("+6 days", $botom); 639 } else { 640 $botom = strtotime($year."W".str_pad($week, 2, '0', STR_PAD_LEFT)); 641 $top = strtotime("+6 days", $botom); 642 } 642 643 if($from >= $botom 643 644 and $from <= $top){
Note: See TracChangeset
for help on using the changeset viewer.