[geeklog-cvs] Geeklog-1.x/public_html/calendar event.php, 1.24, 1.25 index.php, 1.21, 1.22
Oliver
ospiess at qs1489.pair.com
Sun Nov 25 01:58:58 EST 2007
Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/calendar
In directory qs1489.pair.com:/tmp/cvs-serv9782/calendar
Modified Files:
event.php index.php
Log Message:
XHTML optional updates
Index: event.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/calendar/event.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** event.php 10 Oct 2007 01:57:44 -0000 1.24
--- event.php 25 Nov 2007 06:58:56 -0000 1.25
***************
*** 63,66 ****
--- 63,67 ----
$cal_template = new Template($_CONF['path'] . 'plugins/calendar/templates/');
$cal_template->set_file (array ('addevent' => 'addevent.thtml'));
+ $cal_template->set_var( 'xhtml', XHTML );
$cal_template->set_var('site_url', $_CONF['site_url']);
$cal_template->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 91,97 ****
$cal_template->set_var('lang_where',$LANG_CAL_1[4]);
! $location = stripslashes($A['location']) . '<br>'
! . stripslashes ($A['address1']) . '<br>'
! . stripslashes ($A['address2']) . '<br>'
. stripslashes ($A['city'])
. ', ' . $A['state'] . ' ' . $A['zipcode'];
--- 92,98 ----
$cal_template->set_var('lang_where',$LANG_CAL_1[4]);
! $location = stripslashes($A['location']) . '<br' . XHTML . '>'
! . stripslashes ($A['address1']) . '<br' . XHTML . '>'
! . stripslashes ($A['address2']) . '<br' . XHTML . '>'
. stripslashes ($A['city'])
. ', ' . $A['state'] . ' ' . $A['zipcode'];
***************
*** 168,171 ****
--- 169,173 ----
$cal_templates = new Template($_CONF['path'] . 'plugins/calendar/templates/');
$cal_templates->set_file('form','editpersonalevent.thtml');
+ $cal_templates->set_var( 'xhtml', XHTML );
$cal_templates->set_var('site_url', $_CONF['site_url']);
$cal_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 501,504 ****
--- 503,507 ----
));
+ $cal_templates->set_var ( 'xhtml', XHTML );
$cal_templates->set_var ('lang_addevent', $LANG_CAL_1[6]);
$cal_templates->set_var ('lang_backtocalendar', $LANG_CAL_1[15]);
***************
*** 629,633 ****
$cal_templates->set_var ('br0', '');
} else {
! $cal_templates->set_var ('br0', '<br>');
}
if (empty ($A['address1']) || (empty ($A['address2']) &&
--- 632,636 ----
$cal_templates->set_var ('br0', '');
} else {
! $cal_templates->set_var ('br0', '<br' . XHTML . '>');
}
if (empty ($A['address1']) || (empty ($A['address2']) &&
***************
*** 635,644 ****
$cal_templates->set_var ('br1', '');
} else {
! $cal_templates->set_var ('br1', '<br>');
}
if (empty ($A['address2']) || !$hasCityEtc) {
$cal_templates->set_var ('br2', '');
} else {
! $cal_templates->set_var ('br2', '<br>');
}
}
--- 638,647 ----
$cal_templates->set_var ('br1', '');
} else {
! $cal_templates->set_var ('br1', '<br' . XHTML . '>');
}
if (empty ($A['address2']) || !$hasCityEtc) {
$cal_templates->set_var ('br2', '');
} else {
! $cal_templates->set_var ('br2', '<br' . XHTML . '>');
}
}
***************
*** 666,670 ****
$img = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
. $_IMAGE_TYPE . '" alt="' . $LANG01[4] . '" title="'
! . $LANG01[4] . '">';
$cal_templates->set_var ('edit_icon', COM_createLink($img, $editurl));
} else if ((SEC_hasAccess ($A['owner_id'], $A['group_id'],
--- 669,673 ----
$img = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
. $_IMAGE_TYPE . '" alt="' . $LANG01[4] . '" title="'
! . $LANG01[4] . '"' . XHTML . '>';
$cal_templates->set_var ('edit_icon', COM_createLink($img, $editurl));
} else if ((SEC_hasAccess ($A['owner_id'], $A['group_id'],
***************
*** 676,680 ****
$img = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
. $_IMAGE_TYPE . '" alt="' . $LANG01[4] . '" title="'
! . $LANG01[4] . '">';
$cal_templates->set_var ('edit_icon', COM_createLink($img, $editurl));
$cal_templates->set_var ('hits_admin',
--- 679,683 ----
$img = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
. $_IMAGE_TYPE . '" alt="' . $LANG01[4] . '" title="'
! . $LANG01[4] . '"' . XHTML . '>';
$cal_templates->set_var ('edit_icon', COM_createLink($img, $editurl));
$cal_templates->set_var ('hits_admin',
Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/calendar/index.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** index.php 17 Jun 2007 07:36:51 -0000 1.21
--- index.php 25 Nov 2007 06:58:56 -0000 1.22
***************
*** 47,50 ****
--- 47,51 ----
$login = new Template($_CONF['path_layout'] . 'submit');
$login->set_file (array ('login'=>'submitloginrequired.thtml'));
+ $login->set_var ( 'xhtml', XHTML );
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
***************
*** 218,222 ****
. '/calendar/images/delete_event.' . $_IMAGE_TYPE
. '" alt="' . $LANG_CAL_2[30] . '" title="'
! . $LANG_CAL_2[30] . '">';
if ($mode == 'personal') {
if (SEC_hasAccess ($A['owner_id'], $A['group_id'], $A['perm_owner'],
--- 219,223 ----
. '/calendar/images/delete_event.' . $_IMAGE_TYPE
. '" alt="' . $LANG_CAL_2[30] . '" title="'
! . $LANG_CAL_2[30] . '"' . XHTML . '>';
if ($mode == 'personal') {
if (SEC_hasAccess ($A['owner_id'], $A['group_id'], $A['perm_owner'],
***************
*** 484,487 ****
--- 485,489 ----
'dayview'=>'dayview.thtml',
'quickadd'=>'quickaddform.thtml'));
+ $cal_templates->set_var ( 'xhtml', XHTML );
$cal_templates->set_var ('site_url', $_CONF['site_url']);
$cal_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 557,561 ****
$cal_templates->set_var('event_title',stripslashes($A['title']));
if ($i < count($alldaydata)) {
! $cal_templates->set_var('br', '<br>');
} else {
$cal_templates->set_var('br', '');
--- 559,563 ----
$cal_templates->set_var('event_title',stripslashes($A['title']));
if ($i < count($alldaydata)) {
! $cal_templates->set_var('br', '<br' . XHTML . '>');
} else {
$cal_templates->set_var('br', '');
***************
*** 587,591 ****
$cal_templates->set_var('event_title', stripslashes($A['title']));
if ($j < $numevents) {
! $cal_templates->set_var('br', '<br>');
} else {
$cal_templates->set_var('br', '');
--- 589,593 ----
$cal_templates->set_var('event_title', stripslashes($A['title']));
if ($j < $numevents) {
! $cal_templates->set_var('br', '<br' . XHTML . '>');
} else {
$cal_templates->set_var('br', '');
***************
*** 618,621 ****
--- 620,624 ----
'events'=>'weekview/events.thtml',
'quickadd'=>'dayview/quickaddform.thtml'));
+ $cal_templates->set_var ( 'xhtml', XHTML );
$cal_templates->set_var ('site_url', $_CONF['site_url']);
$cal_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 710,714 ****
. COM_createLink( strftime ('%x', $thedate[1]),
$_CONF['site_url'] . '/calendar/index.php?' . addMode ($mode)
! . "view=day&day$daynum &month=$monthnum&year=$yearnum")
);
if ($mode == 'personal') {
--- 713,717 ----
. COM_createLink( strftime ('%x', $thedate[1]),
$_CONF['site_url'] . '/calendar/index.php?' . addMode ($mode)
! . "view=day&day$daynum&month=$monthnum&year=$yearnum")
);
if ($mode == 'personal') {
***************
*** 800,803 ****
--- 803,807 ----
));
+ $cal_templates->set_var ( 'xhtml', XHTML );
$cal_templates->set_var ('site_url', $_CONF['site_url']);
$cal_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 923,927 ****
. 'day=' . $curday->daynumber . "&month=$month&year=$year",
array('class'=>'cal-date'))
! . '<hr>'
);
--- 927,931 ----
. 'day=' . $curday->daynumber . "&month=$month&year=$year",
array('class'=>'cal-date'))
! . '<hr' . XHTML . '>'
);
***************
*** 961,969 ****
. 'eid=' . $results['eid'],
array('class'=>'cal-event'))
! . '<hr>';
}
}
for ($z = $z; $z <= 4; $z++) {
! $entries .= '<br>';
}
--- 965,973 ----
. 'eid=' . $results['eid'],
array('class'=>'cal-event'))
! . '<hr' . XHTML . '>';
}
}
for ($z = $z; $z <= 4; $z++) {
! $entries .= '<br' . XHTML . '>';
}
***************
*** 973,977 ****
if ($q2_numrows < 4) {
for ($t=0; $t < (4 - $q2_numrows); $t++) {
! $cal_templates->set_var('cal_day_entries','<br><br><br><br>');
}
}
--- 977,981 ----
if ($q2_numrows < 4) {
for ($t=0; $t < (4 - $q2_numrows); $t++) {
! $cal_templates->set_var('cal_day_entries','<br' . XHTML . '><br' . XHTML . '><br' . XHTML . '><br' . XHTML . '>');
}
}
More information about the geeklog-cvs
mailing list