/drupal7/sites/all/modules/date/date_repeat/date_repeat_calc.inc - Diff - Club Drupal - Forge Centrale Marseille

Révision 599a39cd

Ajouté par Assos Assos il y a environ 3 ans

ID 599a39cdec4ceb30754ede873cda4c36703e9ce4
Parent f9d4b898
Enfant 91af538d

Weekly update of contrib modules

     <?php
     /**
      * @file
      * Code to compute the dates that match an iCal RRULE.
-...
       // Create a date object for the start and end dates.
       $start_date = new DateObject($start, $timezone);
       // Versions of PHP greater than PHP 5.3.5 require
       // that we set an explicit time when using date_modify()
       // or the time may not match the original value.
       // Adding this modifier gives us the same results in both older
       // and newer versions of PHP.
       // Versions of PHP greater than PHP 5.3.5 require that we set an explicit
       // time when using date_modify() or the time may not match the original value.
       // Adding this modifier gives us the same results in both older and newer
       // versions of PHP.
       $modify_time = ' ' . $start_date->format('g:ia');
       // If the rule has an UNTIL, see if that is earlier than the end date.
-...
+      }
       $rrule = date_repeat_adjust_rrule($rrule, $start_date);
       // The start date always goes into the results, whether or not it meets
       // the rules. RFC 2445 includes examples where the start date DOES NOT
       // meet the rules, but the expected results always include the start date.
       // The start date always goes into the results, whether or not it meets the
       // rules. RFC 2445 includes examples where the start date DOES NOT meet the
       // rules, but the expected results always include the start date.
       $days = array(date_format($start_date, DATE_FORMAT_DATETIME));
       // BYMONTHDAY will look for specific days of the month in one or more months.
       // This process is only valid when frequency is monthly or yearly.
       if (!empty($rrule['BYMONTHDAY'])) {
         $finished = FALSE;
         $current_day = clone($start_date);
         $current_day = clone $start_date;
         $direction_days = array();
         // Deconstruct the day in case it has a negative modifier.
         foreach ($rrule['BYMONTHDAY'] as $day) {
-...
+        }
+      }
       // This is the simple fallback case, not looking for any BYDAY,
       // just repeating the start date. Because of imputed BYDAY above, this
       // will only test TRUE for a DAILY or less frequency (like HOURLY).
       // This is the simple fallback case, not looking for any BYDAY, just
       // repeating the start date. Because of imputed BYDAY above, this will only
       // test TRUE for a DAILY or less frequency (like HOURLY).
       elseif (empty($rrule['BYDAY'])) {
         // $current_day will keep track of where we are in the calculation.
         $current_day = clone($start_date);
         $current_day = clone $start_date;
         $finished = FALSE;
         $months = !empty($rrule['BYMONTH']) ? $rrule['BYMONTH'] : array();
         while (!$finished) {
-...
+      }
       else {
         // More complex searches for day names and criteria
         // like '-1SU' or '2TU,2TH', require that we interate through
         // the whole time period checking each BYDAY.
         // Create helper array to pull day names out of iCal day strings.
         // More complex searches for day names and criteria like '-1SU' or
         // '2TU,2TH', require that we interate through the whole time period
         // checking each BYDAY. Create helper array to pull day names out of iCal
         // day strings.
         $day_names = date_repeat_dow_day_options(FALSE);
         $days_of_week = array_keys($day_names);
         // Parse out information about the BYDAYs and separate them
         // depending on whether they have directional parameters like -1SU or 2TH.
         // Parse out information about the BYDAYs and separate them depending on
         // whether they have directional parameters like -1SU or 2TH.
         $month_days = array();
         $week_days = array();
-...
         $week_start_rule = !empty($rrule['WKST']) ? trim($rrule['WKST']) : 'MO';
         $week_start_day = $day_names[$week_start_rule];
         // Make sure the week days array is sorted into week order,
         // we use the $ordered_keys to get the right values into the key
         // and force the array to that order. Needed later when we
         // iterate through each week looking for days so we don't
         // jump to the next week when we hit a day out of order.
         // Make sure the week days array is sorted into week order, we use the
         // $ordered_keys to get the right values into the key and force the array
         // to that order. Needed later when we iterate through each week looking
         // for days so we don't jump to the next week when we hit a day out of
         // order.
         $ordered = date_repeat_days_ordered($week_start_rule);
         $ordered_keys = array_flip($ordered);
-...
           foreach ($rrule['BYMONTH'] as $month) {
             foreach ($rrule['BYDAY'] as $day) {
               preg_match("@(-)?([0-9]+)?([SU|MO|TU|WE|TH|FR|SA]{2})@", trim($day), $regs);
               // Convert parameters into full day name, count, and direction.
               // Add leading zero to first 9 months.
               // Convert parameters into full day name, count, and direction. Add
               // leading zero to first 9 months.
               if (!empty($regs[2])) {
                 $direction_days[] = array(
                   'day' => $day_names[$regs[3]],
-...
+        }
         ksort($week_days);
         // BYDAYs with parameters like -1SU (last Sun) or 2TH (second Thur)
         // need to be processed one month or year at a time.
         // BYDAYs with parameters like -1SU (last Sun) or 2TH (second Thur) need to
         // be processed one month or year at a time.
         if (!empty($direction_days) && in_array($rrule['FREQ'], array('MONTHLY', 'YEARLY'))) {
           $finished = FALSE;
           $current_day = clone($start_date);
           $current_day = clone $start_date;
           while (!$finished) {
             foreach ($direction_days as $day) {
               // Find the BYDAY date in the current month.
-...
               date_repeat_add_dates($days, $current_day, $start_date, $end_date, $exceptions, $rrule);
+            }
             $finished = date_repeat_is_finished($current_day, $days, $count, $end_date);
             // Reset to beginning of period before jumping to next period.
             // Needed especially when working with values like 'last Saturday'
             // to be sure we don't skip months like February.
             // Reset to beginning of period before jumping to next period. Needed
             // especially when working with values like 'last Saturday' to be sure
             // we don't skip months like February.
             $year = date_format($current_day, 'Y');
             $month = date_format($current_day, 'n');
             if ($rrule['FREQ'] == 'MONTHLY') {
-...
+          }
+        }
         // For BYDAYs without parameters,like TU,TH (every Tues and Thur),
         // we look for every one of those days during the frequency period.
         // Iterate through periods of a WEEK, MONTH, or YEAR, checking for
         // the days of the week that match our criteria for each week in the
         // period, then jumping ahead to the next week, month, or year,
         // an INTERVAL at a time.
         // For BYDAYs without parameters,like TU,TH (every Tues and Thur), we look
         // for every one of those days during the frequency period. Iterate through
         // periods of a WEEK, MONTH, or YEAR, checking for the days of the week
         // that match our criteria for each week in the period, then jumping ahead
         // to the next week, month, or year, an INTERVAL at a time.
         if (!empty($week_days) &&
           in_array($rrule['FREQ'], array('MONTHLY', 'WEEKLY', 'YEARLY'))) {
           $finished = FALSE;
           $current_day = clone($start_date);
           $current_day = clone $start_date;
           $format = $rrule['FREQ'] == 'YEARLY' ? 'Y' : 'n';
           $current_period = date_format($current_day, $format);
           // Back up to the beginning of the week in case we are somewhere in the
           // middle of the possible week days, needed so we don't prematurely
           // jump to the next week. The date_repeat_add_dates() function will
           // keep dates outside the range from getting added.
           // middle of the possible week days, needed so we don't prematurely jump
           // to the next week. The date_repeat_add_dates() function will keep dates
           // outside the range from getting added.
           if (date_format($current_day, 'l') != $day_names[$day]) {
             date_modify($current_day, '-1 ' . $week_start_day . $modify_time);
+          }
-...
             while (!$period_finished) {
               $moved = FALSE;
               foreach ($week_days as $delta => $day) {
                 // Find the next occurence of each day in this week, only add it
                 // if we are still in the current month or year.
                 // The date_repeat_add_dates function is insufficient
                 // to test whether to include this date
                 // if we are using a rule like 'every other month', so we must
                 // explicitly test it here.
                 // If we're already on the right day, don't jump or we
                 // will prematurely move into the next week.
                 // Find the next occurence of each day in this week, only add it if
                 // we are still in the current month or year. The
                 // date_repeat_add_dates() function is insufficient to test whether
                 // to include this date if we are using a rule like 'every other
                 // month', so we must explicitly test it here. If we're already on
                 // the right day, don't jump or we will prematurely move into the
                 // next week.
                 if (date_format($current_day, 'l') != $day) {
                   date_modify($current_day, '+1 ' . $day . $modify_time);
                   $moved = TRUE;
-...
+              }
               $finished = date_repeat_is_finished($current_day, $days, $count, $end_date);
               // Make sure we don't get stuck in endless loop if the current
               // day never got changed above.
               // Make sure we don't get stuck in endless loop if the current day
               // never got changed above.
               if (!$moved) {
                 date_modify($current_day, '+1 day' . $modify_time);
+              }
               // If this is a WEEKLY frequency, stop after each week,
               // otherwise, stop when we've moved outside the current period.
               // Jump to the end of the week, then test the period.
               // If this is a WEEKLY frequency, stop after each week, otherwise,
               // stop when we've moved outside the current period. Jump to the end
               // of the week, then test the period.
               if ($finished || $rrule['FREQ'] == 'WEEKLY') {
                 $period_finished = TRUE;
+              }
-...
               continue;
+            }
             // We'll be at the end of a week, month, or year when
             // we get to this point in the code.
             // Go back to the beginning of this period before we jump, to
             // ensure we jump to the first day of the next period.
             // We'll be at the end of a week, month, or year when we get to this
             // point in the code. Go back to the beginning of this period before we
             // jump, to ensure we jump to the first day of the next period.
             switch ($rrule['FREQ']) {
               case 'WEEKLY':
                 date_modify($current_day, '+1 ' . $week_start_day . $modify_time);
-...
       // RFC 2445 says if no day or monthday is specified when creating repeats for
       // weeks, months, or years, impute the value from the start date.
       if (empty($rrule['BYDAY']) && $rrule['FREQ'] == 'WEEKLY') {
         $rrule['BYDAY'] = array(date_repeat_dow2day(date_format($start_date, 'w')));
+      }
-...
           $rrule['BYMONTH'] = array(date_format($start_date, 'n'));
+        }
+      }
       // If we are processing rules for period other than YEARLY or MONTHLY
       // and have BYDAYS like 2SU or -1SA, simplify them to SU or SA since the
       // position rules make no sense in other periods and just add complexity.
       // If we are processing rules for period other than YEARLY or MONTHLY and have
       // BYDAYS like 2SU or -1SA, simplify them to SU or SA since the position
       // rules make no sense in other periods and just add complexity.
       elseif (!empty($rrule['BYDAY']) && !in_array($rrule['FREQ'], array('MONTHLY', 'YEARLY'))) {
         foreach ($rrule['BYDAY'] as $delta => $by_day) {
           $rrule['BYDAY'][$delta] = substr($by_day, -2);
-...
     /**
      * Helper function to add found date to the $dates array.
+     *
      * Check that the date to be added is between the start and end date
      * and that it is not in the $exceptions, nor already in the $days array,
      * and that it meets other criteria in the RRULE.
      * Check that the date to be added is between the start and end date and that it
      * is not in the $exceptions, nor already in the $days array, and that it meets
      * other criteria in the RRULE.
      */
     function date_repeat_add_dates(&$days, $current_day, $start_date, $end_date, $exceptions, $rrule) {
       if (isset($rrule['COUNT']) && count($days) >= $rrule['COUNT']) {
-...
      * Set a date object to a specific day of the month.
+     *
      * Example,
      *   date_set_month_day($date, 'Sunday', 2, '-')
      *   will reset $date to the second to last Sunday in the month.
      *   If $day is empty, will set to the number of days from the
      *   beginning or end of the month.
      *   date_set_month_day($date, 'Sunday', 2, '-') will reset $date to the second
      *   to last Sunday in the month. If $day is empty, will set to the number of
      *   days from the beginning or end of the month.
      */
     function date_repeat_set_month_day($date_in, $day, $count = 1, $direction = '+', $timezone = 'UTC', $modify_time = '') {
       if (is_object($date_in)) {
         $current_month = date_format($date_in, 'n');
         // Reset to the start of the month.
         // We should be able to do this with date_date_set(), but
         // for some reason the date occasionally gets confused if run
         // through this function multiple times. It seems to work
         // reliably if we create a new object each time.
         // Reset to the start of the month. We should be able to do this with
         // date_date_set(), but for some reason the date occasionally gets confused
         // if run through this function multiple times. It seems to work reliably
         // if we create a new object each time.
         $datetime = date_format($date_in, DATE_FORMAT_DATETIME);
         $datetime = substr_replace($datetime, '01', 8, 2);
         $date = new DateObject($datetime, $timezone);
-...
           date_modify($date, '+1 month' . $modify_time);
+        }
         else {
           // For positive search, back up one day to get outside the
           // current month, so we can catch the first of the month.
           // For positive search, back up one day to get outside the current month,
           // so we can catch the first of the month.
           date_modify($date, '-1 day' . $modify_time);
+        }
-...
           date_modify($date, $direction . $count . ' days' . $modify_time);
+        }
         else {
           // Use the English text for order, like First Sunday
           // instead of +1 Sunday to overcome PHP5 bug, (see #369020).
           // Use the English text for order, like First Sunday instead of +1 Sunday
           // to overcome PHP5 bug, (see #369020).
           $order = date_order();
           $step = $count <= 5 ? $order[$direction . $count] : $count;
           date_modify($date, $step . ' ' . $day . $modify_time);
-...
      * Set a date object to a specific day of the year.
+     *
      * Example,
      *   date_set_year_day($date, 'Sunday', 2, '-')
      *   will reset $date to the second to last Sunday in the year.
      *   If $day is empty, will set to the number of days from the
      *   beginning or end of the year.
      *   date_set_year_day($date, 'Sunday', 2, '-') will reset $date to the second
      *   to last Sunday in the year. If $day is empty, will set to the number of
      *   days from the beginning or end of the year.
      */
     function date_repeat_set_year_day($date_in, $month, $day, $count = 1, $direction = '+', $timezone = 'UTC', $modify_time = '') {
       if (is_object($date_in)) {
         $current_year = date_format($date_in, 'Y');
         // Reset to the start of the month.
         // See note above.
         // Reset to the start of the month. See note above.
         $datetime = date_format($date_in, DATE_FORMAT_DATETIME);
         $month_key = isset($month) ? $month : '01';
         $datetime = substr_replace($datetime, $month_key . '-01', 5, 5);
-...
             $modifier = '+1 month';
+          }
           else {
             // For positive search, back up one day to get outside the
             // current month, so we can catch the first of the month.
             // For positive search, back up one day to get outside the current
             // month, so we can catch the first of the month.
             $modifier = '-1 day';
+          }
+        }
-...
             $modifier = '+1 year';
+          }
           else {
             // For positive search, back up one day to get outside the
             // current year, so we can catch the first of the year.
             // For positive search, back up one day to get outside the current
             // year, so we can catch the first of the year.
             $modifier = '-1 day';
+          }
+        }
-...
           date_modify($date, $direction . $count . ' days' . $modify_time);
+        }
         else {
           // Use the English text for order, like First Sunday
           // instead of +1 Sunday to overcome PHP5 bug, (see #369020).
           // Use the English text for order, like First Sunday instead of +1 Sunday
           // to overcome PHP5 bug, (see #369020).
           $order = date_order();
           $step = $count <= 5 ? $order[$direction . $count] : $count;
           date_modify($date, $step . ' ' . $day . $modify_time);

Formats disponibles : Unified diff

Projet

Général

Profil

Club Drupal

Révision 599a39cd

Ajouté par Assos Assos il y a environ 3 ans