WordPress.org
Get WordPress

Plugin Directory

Changeset 1353178


Ignore:
Timestamp:
02/18/2016 07:29:45 AM (10 years ago)
Author:
Conceptguy
Message:

Adding new features and fix image trigger bug

Location:
holiday-logos/trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • holiday-logos/trunk/elements/holiday-custom.php

    r1331559 r1353178  
    2727// triggered on 'Publish' or 'Update'
    2828function hdl_save_holiday_logos_meta($post_id, $post) {
    29     if ($_POST['action_hdlsave'] == 'save-logo') {
     29    if (isset($_POST['action_hdlsave']) && $_POST['action_hdlsave'] == 'save-logo') {
    3030        if (!current_user_can('edit_post', $post->ID))
    3131            return $post->ID;
    … …  
    5353                continue;
    5454            $hdlenddate = get_post_meta($hdlpost->ID, 'hdlenddate', true);
    55             $hdlextendedbefore = get_post_meta($hdlpost->ID, 'hdlextendedbefore', true);
    56             $hdlextendedafter = get_post_meta($hdlpost->ID, 'hdlextendedafter', true);
    57             if ($hdlextendedbefore > 0) {
    58                 if ($hdlenddate == '') {
    59                     $hdlenddate = $hdlstartdate;
    60                 }
    61                 $hdlstartdate = date('m/d/Y', strtotime($hdlstartdate) - (24 * 3600 * $hdlextendedbefore));
    62             }
    63 
    64             if ($hdlextendedafter > 0 && $hdlenddate != '') {
    65                 $hdlenddate = date('m/d/Y', strtotime($hdlenddate) + (24 * 3600 * $hdlextendedafter));
    66             } elseif ($hdlextendedafter > 0 && $hdlenddate == '') {
    67                 $hdlenddate = date('m/d/Y', strtotime($hdlstartdate) + (24 * 3600 * $hdlextendedafter));
    68             } else {
    69                 $hdlenddate = ($hdlextendedbefore > 0) ? date('m/d/Y', strtotime($hdlstartdate) + (24 * 3600 * $hdlextendedbefore)) : $hdlstartdate;
     55            if ($hdlenddate == '') {
     56                $hdlenddate = $hdlstartdate;
    7057            }
    7158
    … …  
    7461                $curYear = date('Y', strtotime($currentDate));
    7562                if ($curYear > $startYear) {
    76                     $hdlstartdate = date('m/d/Y', strtotime($hdlstartdate) + (24 * 3600 * 365)) . '<br/>';
    77                     $hdlenddate = date('m/d/Y', strtotime($hdlenddate) + (24 * 3600 * 365));
     63                    $hdlstartdate = date('m/d/Y', $hdlstartdate + (24 * 3600 * 365)) . '<br/>';
     64                    $hdlenddate = date('m/d/Y', $hdlenddate + (24 * 3600 * 365));
    7865                }
    7966            }
    … …  
    8471            wp_delete_post( $post->ID, true );
    8572            exit;*/
    86             if (strtotime($_POST['hdlstartdate']) >= strtotime($hdlstartdate) && strtotime($_POST['hdlstartdate']) <= strtotime($hdlenddate)) {
     73             if (strtotime($_POST['hdlstartdate']) >= $hdlstartdate && strtotime($_POST['hdlstartdate']) <= $hdlenddate) {   
    8774                $_SESSION['hdl_save_error'] = ' Date interfere with "<b>' . $hdlpost->post_title . '</b>" holiday dates';
    8875                wp_delete_post( $post->ID, true );
    … …  
    10491            $_POST['hdlemailme'] = 0;
    10592        }
     93
     94    $_POST['hdlstartdate'] = hdl_get_time_stamp($_POST['hdlstartdate']);
     95        $_POST['hdlenddate'] = hdl_get_time_stamp($_POST['hdlenddate']);
    10696
    10797        foreach ($_POST as $key => $value) {
    … …  
    146136    // $hdlheightsize3  =  get_post_meta($post->ID, 'hdlheightsize3', true);
    147137    $hdldatetype = get_post_meta($post->ID, 'hdldatetype', true);
    148     $hdlstartdate = get_post_meta($post->ID, 'hdlstartdate', true);
    149     $hdlenddate = get_post_meta($post->ID, 'hdlenddate', true);
     138    $hdlstartdate = hdl_get_formatted_date(get_post_meta($post->ID, 'hdlstartdate', true));
     139    $hdlenddate = hdl_get_formatted_date(get_post_meta($post->ID, 'hdlenddate', true));
    150140    $hdlextendedbefore = get_post_meta($post->ID, 'hdlextendedbefore', true);
    151141    $hdlextendedafter = get_post_meta($post->ID, 'hdlextendedafter', true);
    152142    $hdlemailme = get_post_meta($post->ID, 'hdlemailme', true);
    153143    $hdlrepeatlogo = get_post_meta($post->ID, 'hdlrepeatlogo', true);
     144    include_once('floating-holiday.php');
     145    $floating_holidays = hdl_list_floating_holidays();
    154146    ?>
    155147    <table width="100%" class="hdlogo">
    … …  
    225217                    <option value="fixed" <?php _e($hdldatetype == "fixed" ? "selected" : ""); ?>>Fixed</option>
    226218                    <option value="range" <?php _e($hdldatetype == "range" ? "selected" : ""); ?>>Range</option>
    227                 </select>
     219<?php
     220                      foreach ($floating_holidays as $key => $value) {
     221                          ?>
     222                          <option value="<?php echo $value;?>"  <?php _e($hdldatetype == $value ? "selected" : ""); ?>><?php echo $key;?></option>
     223                          <?php
     224                      }
     225                    ?>
     226                </select>
     227       
    228228                <input type="text" name="hdlstartdate" style="float:left" required="" id="hdlstartdate" size="10" placeholder="Date" value="<?php echo $hdlstartdate; ?>" />
    229229                <input type="text" name="hdlenddate" style="float:left;display: <?php _e($hdldatetype == "range" ? "block" : "none"); ?>" id="hdlenddate" size ="10" placeholder="End Date" value="<?php echo $hdlenddate; ?>" />
    … …  
    245245
    246246            </td></tr>
    247         <tr><td colspan="2">&nbsp;</td></tr>
    248         <tr class="hide-fla">
    249             <th scope="row"><?php _e('Extended Before'); ?>
    250             </th>
    251             <td>
    252                 <select name="hdlextendedbefore">
    253                     <?php for ($i = 0; $i <= 15; $i++) { ?>
    254                         <option value="<?php echo $i; ?>" <?php _e($hdlextendedbefore == $i ? "selected" : ""); ?>><?php echo $i; ?></option>
    255                     <?php } ?>
    256                 </select>
    257             </td></tr>
    258         <tr><td colspan="2">&nbsp;</td></tr>
    259         <tr class="hide-fla">
    260             <th scope="row"><?php _e('Extended After '); ?>
    261             </th>
    262             <td>
    263                 <select name="hdlextendedafter">
    264                     <?php for ($j = 0; $j <= 15; $j++) { ?>
    265                         <option value="<?php echo $j; ?>" <?php _e($hdlextendedafter == $j ? "selected" : ""); ?>><?php echo $j; ?></option>
    266                     <?php } ?>
    267                 </select>
    268             </td></tr>
    269         <!--<tr><th>&nbsp;</th><th><input type="checkbox" name="hdlemailme" value="1" <?php //_e($hdlemailme == 1 ? "checked" : ""); ?>/>Email me when an image change date starts and ends.</th></tr>-->
     247       
    270248        <tr><td colspan="2">&nbsp;</td></tr>
    271249        <tr><th>&nbsp;</th><th><input type="checkbox" name="hdlrepeatlogo" value="1" <?php _e($hdlrepeatlogo == 1 ? "checked" : ""); ?>/>Repeat every year.</th></tr>

  • holiday-logos/trunk/elements/predefine-holiday.php

    r1331559 r1353178  
    11<?php if ( ! defined( 'ABSPATH' ) ) exit;
    2 
     2require_once 'floating-holiday.php';
    33ob_start();
    4 $hdleventdate = array(
     4$current_year = date('Y');
     5$previous_year= $current_year-1;
     6/*$hdleventdate = array(
    57                        "New Year's Day"=>'01/01/2015',
    68                        "Groundhog's Day"=>'02/02/2015',
    … …  
    3133                        "Christmas Day"=>'12/25/2015',
    3234                        "New Year's Eve"=>'12/31/2015'
     35                    );*/
     36
     37$hdleventdate = array(
     38                        "New Year's Day"=>'01/01/'.$current_year,
     39                        "Groundhog's Day"=>'02/02/'.$current_year,
     40                        "Valentine's Day"=>'02/14/'.$current_year,
     41                        "Lincoln's Birthday"=>'02/12/'.$current_year,
     42                        "Washington's Birthday"=>'02/22/'.$current_year,
     43                        "President's Day"=>hdl_presidents_holiday($current_year),
     44                        "Easter"=>hdl_easter_hoiday($current_year),
     45                        "St. Patick's Day"=>'03/17/'.$current_year,
     46                        "April Fool's Day"=>'04/01/'.$current_year,
     47                        "Earth Day"=>'04/22/'.$current_year,
     48                        "Cinco De Mayo"=>'05/05/'.$current_year,
     49                        "Mother's Day"=>'05/07/'.$current_year.'-05/16/'.$current_year.'-Sunday',
     50                        "Armed Forces Day"=>'05/15/'.$current_year.'-05/21/'.$current_year.'-Saturday',
     51                        "Memorial Day"=>hdl_memorial_holiday($current_year),
     52                        "Flag Day"=>'06/14/'.$current_year,
     53                        "Father's Day"=>'06/15/'.$current_year.'-06/22/'.$current_year.'-Sunday',
     54                        "Independence Day (USA)"=>'07/04/'.$current_year,
     55                        "Parent's Day"=>'07/22/'.$current_year.'-07/30/'.$current_year.'-Sunday',
     56                        "Labor Day"=>hdl_labor_holiday($current_year),
     57                        "Grandparent's Day"=>'10/09/'.$current_year.'-10/15/'.$current_year.'-Monday',
     58                        "Columbus Day"=>hdl_columbus_holiday($current_year),
     59                        "Halloween"=>'10/31/'.$current_year,
     60                        "Election Day"=>'11/02/'.$current_year.'-11/10/'.$current_year.'-Tuesday',
     61                        "Veteran's Day"=>'11/11/'.$current_year,
     62                        "Thanksgiving"=>hdl_thanksgiving_holiday($current_year),
     63                        "Christmas Eve"=>'12/24/'.$current_year,
     64                        "Christmas Day"=>'12/25/'.$current_year,
     65                        "New Year's Eve"=>'12/31/'.$previous_year
    3366                    );
     67
    3468 ?>

  • holiday-logos/trunk/holiday-logos.php

    r1332440 r1353178  
    44  Plugin URI: http://holidaylogos.com
    55  Description: Automatically changes your logo, image, background, or video based on the date.
    6   Version: 1.1.4
     6  Version: 1.1.5
    77  Author: CONCEPTiNET
    88  Author URI: https://conceptinet.com
    … …  
    2626function hdl_custom_page_column_content( $column_name, $post_id ) {
    2727    if ( $column_name == 'hdlstartdate' ) {
    28         echo get_post_meta($post_id, 'hdlstartdate', true);
     28        echo hdl_get_formatted_date(get_post_meta($post_id, 'hdlstartdate', true));
    2929    }
    3030}
    … …  
    6262            if (strpos($value, '-') !== false) {
    6363                $value = explode('-', $value);
     64                $value[0] = hdl_get_time_stamp($value[0]);
    6465                add_post_meta($post_ID, 'hdlstartdate', $value[0]);
     66                if($value[1]!=='') $value[1] = hdl_get_time_stamp($value[1]);
    6567                add_post_meta($post_ID, 'hdlenddate', $value[1]);
    6668                if ($value[2] != '') {
    … …  
    6870                }
    6971            } else {
     72                $value = hdl_get_time_stamp($value);
    7073                add_post_meta($post_ID, 'hdlstartdate', $value);
    7174            }
    … …  
    421424                jQuery("#hdlstartdate").attr("placeholder", "Start Date");
    422425            }
    423             else {
     426            else if( jQuery("#hdldatetype").val() == 'fixed' ){
    424427                jQuery("#hdlenddate").hide();
    425428                jQuery("#hdlstartdate").attr("placeholder", "Date");
     429            }else{
     430                var optvalue = jQuery("#hdldatetype").val();
     431                jQuery("#hdlenddate").hide();
     432                jQuery("#hdlstartdate").attr("value", optvalue);
    426433            }
    427434        }
    … …  
    488495    foreach ($hdlGetPosts as $post) {
    489496        $hdlstartdate = get_post_meta($post->ID, 'hdlstartdate', true);
     497        $hdlstartdate = hdl_get_formatted_date($hdlstartdate); 
    490498        $startYear = date('Y', strtotime($hdlstartdate));
    491499        $hdlenddate = get_post_meta($post->ID, 'hdlenddate', true);
    492         $hdlextendedbefore = get_post_meta($post->ID, 'hdlextendedbefore', true);
    493         $hdlextendedafter = get_post_meta($post->ID, 'hdlextendedafter', true);
    494         if ($hdlextendedbefore > 0) {
    495             if ($hdlenddate == '') {
    496                 $hdlenddate = $hdlstartdate;
    497             }
    498             $hdlstartdate = date('m/d/Y', strtotime($hdlstartdate) - (24 * 3600 * $hdlextendedbefore));
    499         }
    500 
    501         if ($hdlextendedafter > 0 && $hdlenddate != '') {
    502             $hdlenddate = date('m/d/Y', strtotime($hdlenddate) + (24 * 3600 * $hdlextendedafter));
    503         } elseif ($hdlextendedafter > 0 && $hdlenddate == '') {
    504             $hdlenddate = date('m/d/Y', strtotime($hdlstartdate) + (24 * 3600 * $hdlextendedafter));
    505         } else {
    506             $hdlenddate = ($hdlextendedbefore > 0) ? date('m/d/Y', strtotime($hdlstartdate) + (24 * 3600 * $hdlextendedbefore)) : $hdlstartdate;
     500        $hdlenddate = hdl_get_formatted_date($hdlenddate);
     501       
     502    if ($hdlenddate == '') {
     503            $hdlenddate = $hdlstartdate;
    507504        }
    508505
    … …  
    513510                $hdlenddate = date('m/d/Y', strtotime($hdlenddate) + (24 * 3600 * 365));
    514511            }
    515         }
     512        }   
    516513
    517514        if (strtotime($hdlstartdate) <= strtotime($currentDate) && strtotime($hdlenddate) >= strtotime($currentDate)) {
    … …  
    730727    foreach ($hdlGetPosts as $post) {
    731728        $hdlstartdate = get_post_meta($post->ID, 'hdlstartdate', true);
     729        $hdlstartdate = hdl_get_formatted_date($hdlstartdate);
    732730        $startYear = date('Y', strtotime($hdlstartdate));
    733731        $hdlenddate = get_post_meta($post->ID, 'hdlenddate', true);
    734         $hdlextendedbefore = get_post_meta($post->ID, 'hdlextendedbefore', true);
    735         $hdlextendedafter = get_post_meta($post->ID, 'hdlextendedafter', true);
    736         if ($hdlextendedbefore > 0) {
    737             if ($hdlenddate == '') {
    738                 $hdlenddate = $hdlstartdate;
    739             }
    740             $hdlstartdate = date('m/d/Y', strtotime($hdlstartdate) - (24 * 3600 * $hdlextendedbefore));
    741         }
    742 
    743         if ($hdlextendedafter > 0 && $hdlenddate != '') {
    744             $hdlenddate = date('m/d/Y', strtotime($hdlenddate) + (24 * 3600 * $hdlextendedafter));
    745         } elseif ($hdlextendedafter > 0 && $hdlenddate == '') {
    746             $hdlenddate = date('m/d/Y', strtotime($hdlstartdate) + (24 * 3600 * $hdlextendedafter));
    747         } else {
    748             $hdlenddate = ($hdlextendedbefore > 0) ? date('m/d/Y', strtotime($hdlstartdate) + (24 * 3600 * $hdlextendedbefore)) : $hdlstartdate;
     732        $hdlenddate = hdl_get_formatted_date($hdlenddate);
     733
     734        if ($hdlenddate  == '') {
     735             $hdlenddate = $hdlstartdate; 
    749736        }
    750737
    … …  
    793780
    794781        $csvstream = fopen("php://output", "w");
    795         fputcsv($csvstream, array('Holiday Name','Start Date','End Date','Ext. Before','Ext. After'));
     782        fputcsv($csvstream, array('Holiday Name','Start Date','End Date'));
    796783
    797784        foreach($hdlGetPosts as $hdlpost)
    … …  
    800787            $title = $hdlpost->post_title;
    801788            array_push($csv_r, $title);
    802             $start = get_post_meta($hdlpost->ID, 'hdlstartdate', true);
    803             $end = get_post_meta($hdlpost->ID, 'hdlenddate', true);
     789            $start = hdl_get_formatted_date(get_post_meta($hdlpost->ID, 'hdlstartdate', true));
     790            $end = hdl_get_formatted_date(get_post_meta($hdlpost->ID, 'hdlenddate', true));
    804791            $end = (strlen($end) >= 8) ? $end : $start;
    805792            array_push($csv_r, $start);
    806793            array_push($csv_r, $end);
    807             $before = get_post_meta($hdlpost->ID, 'hdlextendedbefore', true);
    808             $before = (is_numeric($before)) ? $before : 0;
    809             $after = get_post_meta($hdlpost->ID, 'hdlextendedafter', true);
    810             $after = (is_numeric($after)) ? $after : 0;
    811             array_push($csv_r, $before);
    812             array_push($csv_r, $after);
    813 
     794           
    814795            fputcsv($csvstream, $csv_r);
    815796        }
    … …  
    817798
    818799        exit;
    819     }
    820 }
     800    }   
     801}
     802
     803function hdl_get_time_stamp($date, $seperator ='/' ){
     804    if($date){
     805        list($month, $day, $year) = explode($seperator, $date);
     806        return mktime(0, 0, 0, $month, $day, $year);
     807    }else
     808        return $date;
     809
     810}
     811
     812function hdl_get_formatted_date($timestamp, $format='m/d/Y'){
     813    if($timestamp)
     814        return date($format,$timestamp) ;
     815    else
     816        return $timestamp;
     817}
     818
    821819add_action('init', 'hdl_export_report');
    822820

  • holiday-logos/trunk/readme.txt

    r1332440 r1353178  
    55Requires at least: 4.0
    66License: GPLv2 or later
    7 Tested up to: 4.4
     7Tested up to: 4.4.2
    88Stable tag: 1.1.4
    99
    … …  
    6767== Changelog ==
    6868
     69= 1.1.5 =
     70Bugfix: Image change triggers propelry
     71Feature: Store dates as timestamp
     72Feature: Floating rules options for floating holidays
     73Feature: Dymanic date creation for predefined event
     74
    6975= 1.1.4 =
    7076Bugfix: backwards-compatibilty with php 5.3 and earlier
    … …  
    108114
    109115== Credits ==
    110 * Thanks to Chris M., Dani K., Shanti Infotech, Alex D., and Raju R. for your assistance.
    111 
     116* Thanks to Chris M., Dani K., Shanti Infotech, Alex D., Raju R., and Rajesh T. for your assistance.

  • holiday-logos/trunk/report.php

    r1331559 r1353178  
    77);
    88
    9 if ($_GET['order_by'])
     9if (isset($_GET['order_by']) && $_GET['order_by'])
    1010{
    1111    $orderby = $_GET['order_by'];
Note: See TracChangeset for help on using the changeset viewer.