Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/lib/plugin Calendar.php,1.4,1.5
|
From: Carsten K. <car...@us...> - 2002-01-09 17:40:31
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv8188
Modified Files:
Calendar.php
Log Message:
Minor reindenting & rewrapping.
Index: Calendar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Calendar.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Calendar.php 2001/12/16 18:33:25 1.4
--- Calendar.php 2002/01/09 17:40:29 1.5
***************
*** 12,18 ****
// o Docs. Write a pgsrc/CalendarPlugin.
//
! // It would be nice to have some way to get from the individual
! // date pages back to the calendar page. (Subpage support might
! // make this easier.)
/**
--- 12,18 ----
// o Docs. Write a pgsrc/CalendarPlugin.
//
! // It would be nice to have some way to get from the individual date
! // pages back to the calendar page. (Subpage support might make this
! // easier.)
/**
***************
*** 28,32 ****
return _("Calendar");
}
!
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
--- 28,32 ----
return _("Calendar");
}
!
function getDefaultArguments() {
// FIXME: how to exclude multiple pages?
***************
*** 36,40 ****
'month' => '',
'month_offset' => 0,
!
'month_format' => '%B, %Y',
'wday_format' => '%a',
--- 36,40 ----
'month' => '',
'month_offset' => 0,
!
'month_format' => '%B, %Y',
'wday_format' => '%a',
***************
*** 42,61 ****
}
! function __header($pagename, $time) {
$args = &$this->args;
$t = localtime($time - SECONDS_PER_DAY, 1);
$prev_url = WikiURL($pagename, array('month' => $t['tm_mon'] + 1,
! 'year' => $t['tm_year'] + 1900));
!
$t = localtime($time + 32 * SECONDS_PER_DAY, 1);
$next_url = WikiURL($pagename, array('month' => $t['tm_mon'] + 1,
! 'year' => $t['tm_year'] + 1900));
! $prev = QElement('a', array('href' => $prev_url,
'class' => 'cal-arrow',
'title' => gettext("Previous Month")),
'<');
! $next = QElement('a', array('href' => $next_url,
'class' => 'cal-arrow',
'title' => gettext("Next Month")),
--- 42,61 ----
}
! function __header($pagename, $time) {
$args = &$this->args;
$t = localtime($time - SECONDS_PER_DAY, 1);
$prev_url = WikiURL($pagename, array('month' => $t['tm_mon'] + 1,
! 'year' => $t['tm_year'] + 1900));
!
$t = localtime($time + 32 * SECONDS_PER_DAY, 1);
$next_url = WikiURL($pagename, array('month' => $t['tm_mon'] + 1,
! 'year' => $t['tm_year'] + 1900));
! $prev = QElement('a', array('href' => $prev_url,
'class' => 'cal-arrow',
'title' => gettext("Previous Month")),
'<');
! $next = QElement('a', array('href' => $next_url,
'class' => 'cal-arrow',
'title' => gettext("Next Month")),
***************
*** 63,67 ****
! $row = Element('td', array('align' => 'left'), $prev);
$row .= Element('td', array('align' => 'center'),
QElement('b', array('class' => 'cal-header'),
--- 63,67 ----
! $row = Element('td', array('align' => 'left'), $prev);
$row .= Element('td', array('align' => 'center'),
QElement('b', array('class' => 'cal-header'),
***************
*** 73,89 ****
return Element('tr', Element('td', array('colspan' => 7,
! 'align' => 'center'),
$row));
}
!
function __daynames($start_wday) {
! $time = mktime(12, 0, 0, 1, 1, 2001);
! $t = localtime($time, 1);
$time += (7 + $start_wday - $t['tm_wday']) * SECONDS_PER_DAY;
$t = localtime($time, 1);
assert($t['tm_wday'] == $start_wday);
!
$fs = $this->args['wday_format'];
for ($i = 0; $i < 7; $i++) {
--- 73,89 ----
return Element('tr', Element('td', array('colspan' => 7,
! 'align' => 'center'),
$row));
}
!
function __daynames($start_wday) {
! $time = mktime(12, 0, 0, 1, 1, 2001);
! $t = localtime($time, 1);
$time += (7 + $start_wday - $t['tm_wday']) * SECONDS_PER_DAY;
$t = localtime($time, 1);
assert($t['tm_wday'] == $start_wday);
!
$fs = $this->args['wday_format'];
for ($i = 0; $i < 7; $i++) {
***************
*** 99,105 ****
$args = &$this->args;
! $page_for_date = $args['prefix'] . strftime($args['date_format'], $time);
$t = localtime($time, 1);
!
if ($dbi->isWikiPage($page_for_date)) {
$date = Element('a', array('class' => 'cal-day',
--- 99,106 ----
$args = &$this->args;
! $page_for_date = $args['prefix'] . strftime($args['date_format'],
! $time);
$t = localtime($time, 1);
!
if ($dbi->isWikiPage($page_for_date)) {
$date = Element('a', array('class' => 'cal-day',
***************
*** 109,116 ****
}
else {
! $date = QElement('a', array('class' => 'cal-hide',
! 'href' => WikiURL($page_for_date,
! array('action' => 'edit')),
! 'title' => sprintf(_("Edit %s"), $page_for_date)),
$t['tm_mday']);
}
--- 110,118 ----
}
else {
! $date = QElement('a',
! array('class' => 'cal-hide',
! 'href' => WikiURL($page_for_date,
! array('action' => 'edit')),
! 'title' => sprintf(_("Edit %s"), $page_for_date)),
$t['tm_mday']);
}
***************
*** 119,141 ****
" ${date} ");
}
!
function run($dbi, $argstr, $request) {
$this->args = $this->getArgs($argstr, $request);
! $args = &$this->args;
$now = localtime(time(), 1);
foreach ( array('month' => $now['tm_mon'] + 1,
! 'year' => $now['tm_year'] + 1900)
! as $param => $dflt) {
if (!($args[$param] = intval($args[$param])))
! $args[$param] = $dflt;
!
}
! $time = mktime(12, 0, 0, // hh, mm, ss,
$args['month'] + $args['month_offset'], // month (1-12)
! 1, // mday (1-31)
$args['year']);
!
$rows[] = $this->__header($request->getArg('pagename'), $time);
$rows[] = $this->__daynames($args['start_wday']);
--- 121,144 ----
" ${date} ");
}
!
function run($dbi, $argstr, $request) {
$this->args = $this->getArgs($argstr, $request);
! $args = &$this->args;
$now = localtime(time(), 1);
foreach ( array('month' => $now['tm_mon'] + 1,
! 'year' => $now['tm_year'] + 1900)
! as $param => $dflt ) {
!
if (!($args[$param] = intval($args[$param])))
! $args[$param] = $dflt;
!
}
! $time = mktime(12, 0, 0, // hh, mm, ss,
$args['month'] + $args['month_offset'], // month (1-12)
! 1, // mday (1-31)
$args['year']);
!
$rows[] = $this->__header($request->getArg('pagename'), $time);
$rows[] = $this->__daynames($args['start_wday']);
***************
*** 145,149 ****
$row = $col > 0 ? Element('td', array('colspan' => $col)) : '';
$done = false;
!
while (!$done) {
$row .= $this->__date($dbi, $time);
--- 148,152 ----
$row = $col > 0 ? Element('td', array('colspan' => $col)) : '';
$done = false;
!
while (!$done) {
$row .= $this->__date($dbi, $time);
***************
*** 151,171 ****
if (++$col % 7 == 0) {
$rows[] = Element('tr', $row);
! $col = 0;
! $row = '';
}
!
$time += SECONDS_PER_DAY;
! $t = localtime($time, 1);
! $done = $t['tm_mday'] == 1;
}
if ($row) {
! $row .= Element('td', array('colspan' => (42 - $col) % 7));
$rows[] = Element('tr', $row);
}
!
return Element('table', array('cellspacing' => 0,
'cellpadding' => 2,
! 'class' => 'cal'),
"\n" . join("\n", $rows) . "\n");
}
--- 154,174 ----
if (++$col % 7 == 0) {
$rows[] = Element('tr', $row);
! $col = 0;
! $row = '';
}
!
$time += SECONDS_PER_DAY;
! $t = localtime($time, 1);
! $done = $t['tm_mday'] == 1;
}
if ($row) {
! $row .= Element('td', array('colspan' => (42 - $col) % 7));
$rows[] = Element('tr', $row);
}
!
return Element('table', array('cellspacing' => 0,
'cellpadding' => 2,
! 'class' => 'cal'),
"\n" . join("\n", $rows) . "\n");
}
|