Ignore:
Timestamp:
2013/08/28 13:55:43 (7 years ago)
Author:
m_uehara
Message:

#2348 r23140 をマージ

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_13_0/data/module/Calendar/Year.php

    r23126 r23143  
    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: Year.php,v 1.4 2005/10/22 10:25:39 quipo Exp $ 
     21// 
    422/** 
    5  * Contains the Calendar_Minute 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: Year.php 300728 2010-06-24 11:43:56Z quipo $ 
    36  * @link      http://pear.php.net/package/Calendar 
     23 * @package Calendar 
     24 * @version $Id: Year.php,v 1.4 2005/10/22 10:25:39 quipo Exp $ 
    3725 */ 
    3826 
     
    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_Year extends Calendar 
     
    7355    /** 
    7456     * Constructs Calendar_Year 
    75      * 
    76      * @param int $y year e.g. 2003 
    77      * 
     57     * @param int year e.g. 2003 
    7858     * @access public 
    7959     */ 
    8060    function Calendar_Year($y) 
    8161    { 
    82         parent::Calendar($y); 
     62        Calendar::Calendar($y); 
    8363    } 
    8464 
     
    9474     * </code> 
    9575     * It defaults to building Calendar_Month objects. 
    96      * 
    97      * @param array $sDates   (optional) array of Calendar_Month objects 
    98      *                        representing selected dates 
    99      * @param int   $firstDay (optional) first day of week 
    100      *                        (e.g. 0 for Sunday, 2 for Tuesday etc.) 
    101      * 
     76     * @param array (optional) array of Calendar_Month objects representing selected dates 
     77     * @param int (optional) first day of week (e.g. 0 for Sunday, 2 for Tuesday etc.) 
    10278     * @return boolean 
    10379     * @access public 
     
    10581    function build($sDates = array(), $firstDay = null) 
    10682    { 
    107         include_once CALENDAR_ROOT.'Factory.php'; 
     83        require_once CALENDAR_ROOT.'Factory.php'; 
    10884        $this->firstDay = $this->defineFirstDayOfWeek($firstDay); 
    109         $monthsInYear   = $this->cE->getMonthsInYear($this->thisYear()); 
     85        $monthsInYear = $this->cE->getMonthsInYear($this->thisYear()); 
    11086        for ($i=1; $i <= $monthsInYear; $i++) { 
    11187            $this->children[$i] = Calendar_Factory::create('Month', $this->year, $i); 
     
    11995    /** 
    12096     * Called from build() 
    121      * 
    122      * @param array $sDates array of Calendar_Month objects representing selected dates 
    123      * 
     97     * @param array 
    12498     * @return void 
    12599     * @access private 
    126100     */ 
    127     function setSelection($sDates)  
    128     { 
     101    function setSelection($sDates) { 
    129102        foreach ($sDates as $sDate) { 
    130103            if ($this->year == $sDate->thisYear()) { 
Note: See TracChangeset for help on using the changeset viewer.