OSDN Git Service

PukiWiki/1.4 first beta release
[pukiwiki/pukiwiki.git] / plugin / calendar.inc.php
index 2aa4637..a3c073a 100644 (file)
@@ -1,42 +1,42 @@
 <?php
-// $Id: calendar.inc.php,v 1.10 2002/12/02 02:51:24 panda Exp $
+// $Id: calendar.inc.php,v 1.11 2003/01/27 05:38:44 panda Exp $
 
 function plugin_calendar_convert()
 {
-       global $script,$weeklabels,$vars,$command,$WikiName,$BracketName;
+       global $script,$weeklabels,$vars,$command;
        
        $args = func_get_args();
        
-       if(func_num_args() == 0)
+       if (func_num_args() == 0)
        {
-               $date_str = date("Ym");
-               $pre = $vars[page];
-               $prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
+               $date_str = get_date("Ym");
+               $pre = $vars['page'];
+               $prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars['page'])."/";
        }
-       else if(func_num_args() == 1)
+       else if (func_num_args() == 1)
        {
-               if(is_numeric($args[0]) && strlen($args[0]) == 6)
+               if (is_numeric($args[0]) && strlen($args[0]) == 6)
                {
                        $date_str = $args[0];
-                       $pre = $vars[page];
-                       $prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
+                       $pre = $vars['page'];
+                       $prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars['page'])."/";
                }
                else
                {
-                       $date_str = date("Ym");
+                       $date_str = get_date("Ym");
                        $pre = $args[0];
                        $prefix = $args[0]."/";
                }
        }
-       else if(func_num_args() == 2)
+       else if (func_num_args() == 2)
        {
-               if(is_numeric($args[0]) && strlen($args[0]) == 6)
+               if (is_numeric($args[0]) && strlen($args[0]) == 6)
                {
                        $date_str = $args[0];
                        $pre = $args[1];
                        $prefix = $args[1]."/";
                }
-               else if(is_numeric($args[1]) && strlen($args[1]) == 6)
+               else if (is_numeric($args[1]) && strlen($args[1]) == 6)
                {
                        $date_str = $args[1];
                        $pre = $args[0];
@@ -44,9 +44,9 @@ function plugin_calendar_convert()
                }
                else
                {
-                       $date_str = date("Ym");
-                       $pre = $vars[page];
-                       $prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
+                       $date_str = get_date("Ym");
+                       $pre = $vars['page'];
+                       $prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars['page'])."/";
                }
        }
        else
@@ -54,79 +54,73 @@ function plugin_calendar_convert()
                return FALSE;
        }
 
-       if(!$command) $cmd = "read";
+       if (!$command) $cmd = "read";
        else          $cmd = $command;
        
        $prefix = strip_tags($prefix);
        
        $yr = substr($date_str,0,4);
        $mon = substr($date_str,4,2);
-       if($yr != date("Y") || $mon != date("m"))
+       if ($yr != get_date("Y") || $mon != get_date("m"))
        {
                $now_day = 1;
                $other_month = 1;
        }
        else
        {
-               $now_day = date("d");
+               $now_day = get_date("d");
                $other_month = 0;
        }
-       $today = getdate(mktime(0,0,0,$mon,$now_day,$yr));
+       $today = getdate(mktime(0,0,0,$mon,$now_day,$yr) - LOCALZONE + ZONETIME);
        
-       $m_num = $today[mon];
-       $d_num = $today[mday];
-       $year = $today[year];
-       $f_today = getdate(mktime(0,0,0,$m_num,1,$year));
-       $wday = $f_today[wday];
+       $m_num = $today['mon'];
+       $d_num = $today['mday'];
+       $year = $today['year'];
+       $f_today = getdate(mktime(0,0,0,$m_num,1,$year) - LOCALZONE + ZONETIME);
+       $wday = $f_today['wday'];
        $day = 1;
        $fweek = true;
 
        $m_name = "$year.$m_num ($cmd)";
 
-       if(!preg_match("/^(($WikiName)|($BracketName))$/",$pre))
-               $prefix_url = "[[".$pre."]]";
-       else
-               $prefix_url = $pre;
-
-       $prefix_url = rawurlencode($prefix_url);
+       $prefix_url = rawurlencode(is_pagename($pre) ? $pre : "[[$pre]]");
        $pre = strip_bracket($pre);
 
-       $ret .= '
+       $ret = <<<EOD
 <table class="style_calendar" cellspacing="1" width="150" border="0">
-  <tr>
-    <td align="middle" class="style_td_caltop" colspan="7">
-      <div class="small" style="text-align:center"><strong>'.$m_name.'</strong><br />[<a href="'.$script.'?'.$prefix_url.'">'.$pre.'</a>]</div>
-    </td>
-  </tr>
-  <tr>
-';
+ <tr>
+  <td align="middle" class="style_td_caltop" colspan="7">
+   <span class="small" style="text_align:center"><strong>$m_name</strong><br />
+   [<a href="$script?$prefix_url">$pre</a>]</span>
+  </td>
+ </tr>
+ <tr>
+EOD;
 
        foreach($weeklabels as $label)
-       {
-               $ret .= '
-    <td align="middle" class="style_td_week">
-      <div class="small" style="text-align:center"><strong>'.$label.'</strong></div>
-    </td>';
-       }
+               $ret .= <<<EOD
+  <td align="middle" class="style_td_week">
+   <span class="small" style="text-align:center"><strong>$label</strong></span>
+  </td>
+EOD;
 
-       $ret .= "</tr>\n<tr>\n";
+       $ret .= " </tr>\n <tr>\n";
 
        while(checkdate($m_num,$day,$year))
        {
-               $dt = sprintf("%4d%02d%02d", $year, $m_num, $day);
+               $dt = sprintf('%4d%02d%02d', $year, $m_num, $day);
                $name = "$prefix$dt";
-               $page = "[[$prefix$dt]]";
-               $page_url = rawurlencode("[[$prefix$dt]]");
+               $page = "[[$name]]";
+               $r_page = rawurlencode($page);
                
-               if($cmd == "edit") $refer = "&amp;refer=$page_url";
-               else               $refer = "";
+               $refer = ($cmd == "edit") ? "&amp;refer=$r_page" : '';
                
-               if($cmd == "read" && !is_page($page))
+               if ($cmd == 'read' && !is_page($page))
                        $link = "<strong>$day</strong>";
                else
-                       $link = "<a href=\"$script?cmd=$cmd&amp;page=$page_url$refer\" title=\"$name\"><strong>$day</strong></a>";
+                       $link = "<a href=\"$script?cmd=$cmd&amp;page=$r_page$refer\" title=\"$name\"><strong>$day</strong></a>";
 
-               if($fweek)
+               if ($fweek)
                {
                        for($i=0;$i<$wday;$i++)
                        { // Blank 
@@ -135,18 +129,18 @@ function plugin_calendar_convert()
                $fweek=false;
                }
 
-               if($wday == 0) $ret .= "  </tr><tr>\n";
-               if(!$other_month && ($day == $today[mday]) && ($m_num == $today[mon]) && ($year == $today[year]))
+               if ($wday == 0) $ret .= "  </tr><tr>\n";
+               if (!$other_month && ($day == $today['mday']) && ($m_num == $today['mon']) && ($year == $today['year']))
                {
                        //  Today 
                        $ret .= "    <td align=\"center\" class=\"style_td_today\"><span class=\"small\">$link</span></td>\n"; 
                }
-               else if($wday == 0)
+               else if ($wday == 0)
                {
                        //  Sunday 
                        $ret .= "    <td align=\"center\" class=\"style_td_sun\"><span class=\"small\">$link</span></td>\n";
                }
-               else if($wday == 6)
+               else if ($wday == 6)
                {
                        //  Saturday 
                        $ret .= "    <td align=\"center\" class=\"style_td_sat\"><span class=\"small\">$link</span></td>\n";
@@ -160,7 +154,7 @@ function plugin_calendar_convert()
                $wday++;
                $wday = $wday % 7;
        }
-       if($wday > 0)
+       if ($wday > 0)
        {
                while($wday < 7)
                { // Blank