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/Month/Weekdays.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: Weekdays.php,v 1.4 2005/10/22 10:28:49 quipo Exp $ 
     21// 
    422/** 
    5  * Contains the Calendar_Month_Weekdays 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: Weekdays.php 300729 2010-06-24 12:05:53Z quipo $ 
    36  * @link      http://pear.php.net/package/Calendar 
     23 * @package Calendar 
     24 * @version $Id: Weekdays.php,v 1.4 2005/10/22 10:28:49 quipo Exp $ 
    3725 */ 
    3826 
     
    5947 * <code> 
    6048 * require_once 'Calendar/Month/Weekdays.php'; 
    61  * $Month = new Calendar_Month_Weekdays(2003, 10); // Oct 2003 
     49 * $Month = & new Calendar_Month_Weekdays(2003, 10); // Oct 2003 
    6250 * $Month->build(); // Build Calendar_Day objects 
    6351 * while ($Day = & $Month->fetch()) { 
     
    7563 * } 
    7664 * </code> 
    77  * 
    78  * @category  Date and Time 
    79  * @package   Calendar 
    80  * @author    Harry Fuecks <hfuecks@phppatterns.com> 
    81  * @copyright 2003-2007 Harry Fuecks 
    82  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause) 
    83  * @link      http://pear.php.net/package/Calendar 
    84  * @access    public 
     65 * @package Calendar 
     66 * @access public 
    8567 */ 
    8668class Calendar_Month_Weekdays extends Calendar_Month 
     
    10284    /** 
    10385     * Constructs Calendar_Month_Weekdays 
    104      * 
    105      * @param int $y        year e.g. 2003 
    106      * @param int $m        month e.g. 5 
    107      * @param int $firstDay (optional) first day of week (e.g. 0 for Sunday, 2 for Tuesday etc.) 
    108      * 
     86     * @param int year e.g. 2003 
     87     * @param int month e.g. 5 
     88     * @param int (optional) first day of week (e.g. 0 for Sunday, 2 for Tuesday etc.) 
    10989     * @access public 
    11090     */ 
    11191    function Calendar_Month_Weekdays($y, $m, $firstDay=null) 
    11292    { 
    113         parent::Calendar_Month($y, $m, $firstDay); 
     93        Calendar_Month::Calendar_Month($y, $m, $firstDay); 
    11494    } 
    11595 
     
    11898     * with empty cells if the first day of the week does not fall on the first 
    11999     * day of the month. 
    120      * 
    121      * @param array $sDates (optional) Calendar_Day objects representing selected dates 
    122      * 
    123      * @return boolean 
    124      * @access public 
    125100     * @see Calendar_Day::isEmpty() 
    126101     * @see Calendar_Day_Base::isFirst() 
    127102     * @see Calendar_Day_Base::isLast() 
     103     * @param array (optional) Calendar_Day objects representing selected dates 
     104     * @return boolean 
     105     * @access public 
    128106     */ 
    129     function build($sDates = array()) 
     107    function build($sDates=array()) 
    130108    { 
    131         include_once CALENDAR_ROOT.'Table/Helper.php'; 
    132         $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay); 
     109        require_once CALENDAR_ROOT.'Table/Helper.php'; 
     110        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay); 
    133111        Calendar_Month::build($sDates); 
    134112        $this->buildEmptyDaysBefore(); 
     
    141119    /** 
    142120     * Prepends empty days before the real days in the month 
    143      * 
    144121     * @return void 
    145122     * @access private 
     
    162139    /** 
    163140     * Shifts the array of children forward, if necessary 
    164      * 
    165141     * @return void 
    166142     * @access private 
     
    168144    function shiftDays() 
    169145    { 
    170         if (isset($this->children[0])) { 
     146        if (isset ($this->children[0])) { 
    171147            array_unshift($this->children, null); 
    172148            unset($this->children[0]); 
     
    176152    /** 
    177153     * Appends empty days after the real days in the month 
    178      * 
    179154     * @return void 
    180155     * @access private 
     
    183158    { 
    184159        $eAfter = $this->tableHelper->getEmptyDaysAfter(); 
    185         $sDOM   = $this->tableHelper->getNumTableDaysInMonth(); 
    186         for ($i=1; $i <= $sDOM-$eAfter; $i++) { 
     160        $sDOM = $this->tableHelper->getNumTableDaysInMonth(); 
     161        for ($i = 1; $i <= $sDOM-$eAfter; $i++) { 
    187162            $Day = new Calendar_Day($this->year, $this->month+1, $i); 
    188163            $Day->setEmpty(); 
     
    195170     * Sets the "markers" for the beginning and of a of week, in the 
    196171     * built Calendar_Day children 
    197      * 
    198172     * @return void 
    199173     * @access private 
     
    201175    function setWeekMarkers() 
    202176    { 
    203         $dIW = $this->cE->getDaysInWeek( 
     177        $dIW  = $this->cE->getDaysInWeek( 
    204178            $this->thisYear(), 
    205179            $this->thisMonth(), 
Note: See TracChangeset for help on using the changeset viewer.