Ignore:
Timestamp:
2013/08/28 13:26:44 (11 years ago)
Author:
m_uehara
Message:

#2275
影響が大きいため、2.13.0では対応を行わない r23125 r23128 r23133 を差し戻します。

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_13-dev/data/module/Calendar/Hour.php

    r23125 r23141  
    11<?php 
    22/* vim: set expandtab tabstop=4 shiftwidth=4: */ 
    3  
     3// 
     4// +----------------------------------------------------------------------+ 
     5// | PHP Version 4                                                        | 
     6// +----------------------------------------------------------------------+ 
     7// | Copyright (c) 1997-2002 The PHP Group                                | 
     8// +----------------------------------------------------------------------+ 
     9// | This source file is subject to version 2.02 of the PHP license,      | 
     10// | that is bundled with this package in the file LICENSE, and is        | 
     11// | available at through the world-wide-web at                           | 
     12// | http://www.php.net/license/3_0.txt.                                  | 
     13// | If you did not receive a copy of the PHP license and are unable to   | 
     14// | obtain it through the world-wide-web, please send a note to          | 
     15// | license@php.net so we can mail you a copy immediately.               | 
     16// +----------------------------------------------------------------------+ 
     17// | Authors: Harry Fuecks <hfuecks@phppatterns.com>                      | 
     18// +----------------------------------------------------------------------+ 
     19// 
     20// $Id: Hour.php,v 1.1 2004/05/24 22:25:42 quipo Exp $ 
     21// 
    422/** 
    5  * Contains the Calendar_Hour class 
    6  * 
    7  * PHP versions 4 and 5 
    8  * 
    9  * LICENSE: Redistribution and use in source and binary forms, with or without 
    10  * modification, are permitted provided that the following conditions are met: 
    11  * 1. Redistributions of source code must retain the above copyright 
    12  *    notice, this list of conditions and the following disclaimer. 
    13  * 2. Redistributions in binary form must reproduce the above copyright 
    14  *    notice, this list of conditions and the following disclaimer in the 
    15  *    documentation and/or other materials provided with the distribution. 
    16  * 3. The name of the author may not be used to endorse or promote products 
    17  *    derived from this software without specific prior written permission. 
    18  * 
    19  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
    20  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
    21  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
    22  * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY 
    23  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
    24  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
    25  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
    26  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
    27  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
    28  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    29  * 
    30  * @category  Date and Time 
    31  * @package   Calendar 
    32  * @author    Harry Fuecks <hfuecks@phppatterns.com> 
    33  * @copyright 2003-2007 Harry Fuecks 
    34  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause) 
    35  * @version   CVS: $Id: Hour.php 300729 2010-06-24 12:05:53Z quipo $ 
    36  * @link      http://pear.php.net/package/Calendar 
     23 * @package Calendar 
     24 * @version $Id: Hour.php,v 1.1 2004/05/24 22:25:42 quipo Exp $ 
    3725 */ 
    3826 
     
    5442 * <code> 
    5543 * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Hour.php'; 
    56  * $Hour = new Calendar_Hour(2003, 10, 21, 15); // Oct 21st 2003, 3pm 
     44 * $Hour = & new Calendar_Hour(2003, 10, 21, 15); // Oct 21st 2003, 3pm 
    5745 * $Hour->build(); // Build Calendar_Minute objects 
    5846 * while ($Minute = & $Hour->fetch()) { 
     
    6048 * } 
    6149 * </code> 
    62  * 
    63  * @category  Date and Time 
    64  * @package   Calendar 
    65  * @author    Harry Fuecks <hfuecks@phppatterns.com> 
    66  * @copyright 2003-2007 Harry Fuecks 
    67  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause) 
    68  * @link      http://pear.php.net/package/Calendar 
    69  * @access    public 
     50 * @package Calendar 
     51 * @access public 
    7052 */ 
    7153class Calendar_Hour extends Calendar 
     
    7355    /** 
    7456     * Constructs Calendar_Hour 
    75      * 
    76      * @param int $y year e.g. 2003 
    77      * @param int $m month e.g. 5 
    78      * @param int $d day e.g. 11 
    79      * @param int $h hour e.g. 13 
    80      * 
     57     * @param int year e.g. 2003 
     58     * @param int month e.g. 5 
     59     * @param int day e.g. 11 
     60     * @param int hour e.g. 13 
    8161     * @access public 
    8262     */ 
    8363    function Calendar_Hour($y, $m, $d, $h) 
    8464    { 
    85         parent::Calendar($y, $m, $d, $h); 
     65        Calendar::Calendar($y, $m, $d, $h); 
    8666    } 
    8767 
    88     /** 
     68   /** 
    8969     * Builds the Minutes in the Hour 
    90      * 
    91      * @param array $sDates (optional) Calendar_Minute objects representing selected dates 
    92      * 
     70     * @param array (optional) Calendar_Minute objects representing selected dates 
    9371     * @return boolean 
    9472     * @access public 
    9573     */ 
    96     function build($sDates = array()) 
     74    function build($sDates=array()) 
    9775    { 
    98         include_once CALENDAR_ROOT.'Minute.php'; 
     76        require_once CALENDAR_ROOT.'Minute.php'; 
    9977        $mIH = $this->cE->getMinutesInHour($this->year, $this->month, $this->day, 
    10078                           $this->hour); 
    10179        for ($i=0; $i < $mIH; $i++) { 
    102             $this->children[$i] = 
     80            $this->children[$i]= 
    10381                new Calendar_Minute($this->year, $this->month, $this->day, 
    10482                           $this->hour, $i); 
     
    11290    /** 
    11391     * Called from build() 
    114      * 
    115      * @param array $sDates Calendar_Minute objects representing selected dates 
    116      * 
     92     * @param array 
    11793     * @return void 
    11894     * @access private 
Note: See TracChangeset for help on using the changeset viewer.