[geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.74, 1.75
Oliver
ospiess at qs1489.pair.com
Sun Nov 25 01:56:06 EST 2007
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/plugins/calendar/language english.php, 1.12, 1.13 english_utf-8.php, 1.2, 1.3 japanese.php, 1.3, 1.4 japanese_utf-8.php, 1.3, 1.4
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/plugins/calendar/templates/admin batchdelete.thtml, 1.3, 1.4 eventeditor.thtml, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/calendar
In directory qs1489.pair.com:/tmp/cvs-serv9353/calendar
Modified Files:
functions.inc
Log Message:
XHTML optional updates
Index: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** functions.inc 10 Oct 2007 01:57:15 -0000 1.74
--- functions.inc 25 Nov 2007 06:56:04 -0000 1.75
***************
*** 168,176 ****
if($z == 2) {
if( $numRows > 0 ) {
! $retval .= '<p><b>' . $LANG_CAL_1[23] . '</b><br>';
}
} else {
if( $totalrows > 0 ) {
! $retval .= '<b>' . $LANG_CAL_1[24] . '</b><br>';
}
}
--- 168,176 ----
if($z == 2) {
if( $numRows > 0 ) {
! $retval .= '<p><b>' . $LANG_CAL_1[23] . '</b><br' . XHTML . '>';
}
} else {
if( $totalrows > 0 ) {
! $retval .= '<b>' . $LANG_CAL_1[24] . '</b><br' . XHTML . '>';
}
}
***************
*** 213,217 ****
$skipFirstBreak = false;
} else {
! $retval .= '<br>';
}
if( $todaysEvent ) {
--- 213,217 ----
$skipFirstBreak = false;
} else {
! $retval .= '<br' . XHTML . '>';
}
if( $todaysEvent ) {
***************
*** 223,227 ****
// If different start and end dates, then display end date:
if( $abbrDate1 != $abbrDate2 ) {
! $retval .= ' - <br><b>' . $dayName2 . '</b> <small>' . $abbrDate2 . '</small>';
}
if( $todaysEvent ) {
--- 223,227 ----
// If different start and end dates, then display end date:
if( $abbrDate1 != $abbrDate2 ) {
! $retval .= ' - <br' . XHTML . '><b>' . $dayName2 . '</b> <small>' . $abbrDate2 . '</small>';
}
if( $todaysEvent ) {
***************
*** 436,443 ****
// pseudo-formatted event description for the spam check
! $spamcheck = COM_createLink($A['title'], $A['url']) . '<br>'
! . $A['location'] . '<br>' . $A['address1'] . '<br>'
! . $A['address2'] . '<br>' . $A['city'] . ', ' . $A['zipcode']
! . '<br>' . $A['description'] . '</p>';
$result = PLG_checkforSpam ($spamcheck, $_CONF['spamx']);
if ($result > 0) {
--- 436,443 ----
// pseudo-formatted event description for the spam check
! $spamcheck = COM_createLink($A['title'], $A['url']) . '<br' . XHTML . '>'
! . $A['location'] . '<br' . XHTML . '>' . $A['address1'] . '<br' . XHTML . '>'
! . $A['address2'] . '<br' . XHTML . '>' . $A['city'] . ', ' . $A['zipcode']
! . '<br' . XHTML . '>' . $A['description'] . '</p>';
$result = PLG_checkforSpam ($spamcheck, $_CONF['spamx']);
if ($result > 0) {
***************
*** 562,566 ****
"{$_USER['uid']},'{$A['eid']}','{$A['title']}','{$A['event_type']}','{$A['url']}','{$A['datestart']}','{$A['timestart']}','{$A['dateend']}','{$A['timeend']}',{$A['allday']},'{$A['location']}','{$A['address1']}','{$A['address2']}','{$A['city']}','{$A['state']}','{$A['zipcode']}','{$A['description']}'");
$retval = COM_refresh ($_CONF['site_url']
! . '/calendar/index.php?mode=personal&msg=17');
} else {
// anonymous users don't have personal calendars - bail
--- 562,566 ----
"{$_USER['uid']},'{$A['eid']}','{$A['title']}','{$A['event_type']}','{$A['url']}','{$A['datestart']}','{$A['timestart']}','{$A['dateend']}','{$A['timeend']}',{$A['allday']},'{$A['location']}','{$A['address1']}','{$A['address2']}','{$A['city']}','{$A['state']}','{$A['zipcode']}','{$A['description']}'");
$retval = COM_refresh ($_CONF['site_url']
! . '/calendar/index.php?mode=personal&msg=17');
} else {
// anonymous users don't have personal calendars - bail
***************
*** 586,590 ****
if (substr_count ($_SERVER['PHP_SELF'], '/calendar/') > 0) {
$str = '<link rel="stylesheet" type="text/css" href="'
! . $_CONF['site_url'] . '/calendar/style.css">';
}
--- 586,590 ----
if (substr_count ($_SERVER['PHP_SELF'], '/calendar/') > 0) {
$str = '<link rel="stylesheet" type="text/css" href="'
! . $_CONF['site_url'] . '/calendar/style.css"' . XHTML . '>';
}
***************
*** 632,639 ****
$startat = '';
if ($year > 0) {
! $startat = '&datestart='
. urlencode (sprintf ('%04d-%02d-%02d', $year,
$month, $day))
! . '×tart=' . urlencode (sprintf ('%02d:00:00',
$hour));
}
--- 632,639 ----
$startat = '';
if ($year > 0) {
! $startat = '&datestart='
. urlencode (sprintf ('%04d-%02d-%02d', $year,
$month, $day))
! . '×tart=' . urlencode (sprintf ('%02d:00:00',
$hour));
}
***************
*** 736,739 ****
--- 736,740 ----
$eventform->set_var('lang_submit', $LANG_CAL_1[45]);
$eventform->set_var('mode', $mode);
+ $eventform->set_var('xhtml', XHTML);
$eventform->parse('theform', 'eventform');
$retval .= $eventform->finish($eventform->get_var('theform'));
***************
*** 813,816 ****
--- 814,818 ----
$cal_templates->set_var ('lang_delete_sel', $LANG_ADMIN['delete_sel']);
$cal_templates->set_var ('lang_delconfirm', $LANG_CAL_ADMIN[31]);
+ $cal_templates->set_var('xhtml', XHTML);
$cal_templates->parse('form', 'form');
$desc = $cal_templates->finish($cal_templates->get_var('form'));
***************
*** 818,823 ****
$text_arr = array(
'has_menu' => true,
! 'has_extras' => true,
! 'title'=> $LANG_CAL_ADMIN[11],
'instructions' => $LANG_CAL_ADMIN[27] . $usr_time . "$desc",
'form_url' => $_CONF['site_admin_url'] . "/plugins/calendar/index.php?mode=batchdelete"
--- 820,825 ----
$text_arr = array(
'has_menu' => true,
! 'has_extras' => true,
! 'title' => $LANG_CAL_ADMIN[11],
'instructions' => $LANG_CAL_ADMIN[27] . $usr_time . "$desc",
'form_url' => $_CONF['site_admin_url'] . "/plugins/calendar/index.php?mode=batchdelete"
***************
*** 866,870 ****
if (count($event_list) == 0) {
! $msg = $LANG_CAL_ADMIN[33] . "<br>";
}
$c = 0;
--- 868,872 ----
if (count($event_list) == 0) {
! $msg = $LANG_CAL_ADMIN[33] . "<br" . XHTML . ">";
}
$c = 0;
***************
*** 873,877 ****
$delitem = COM_applyFilter($delitem);
if (!CALENDAR_deleteEvent ($delitem)) {
! $msg .= "<strong>{$LANG_CAL_ADMIN[34]} $delitem $LANG_CAL_ADMIN[35]}</strong><br>\n";
} else {
$c++; // count the deleted users
--- 875,879 ----
$delitem = COM_applyFilter($delitem);
if (!CALENDAR_deleteEvent ($delitem)) {
! $msg .= "<strong>{$LANG_CAL_ADMIN[34]} $delitem $LANG_CAL_ADMIN[35]}</strong><br" . XHTML . ">\n";
} else {
$c++; // count the deleted users
***************
*** 882,886 ****
// zero were deleted instead of just leaving this message away.
COM_numberFormat($c); // just in case we have more than 999)..
! $msg .= "{$LANG_CAL_ADMIN[36]}: $c<br>\n";
return $msg;
}
--- 884,888 ----
// zero were deleted instead of just leaving this message away.
COM_numberFormat($c); // just in case we have more than 999)..
! $msg .= "{$LANG_CAL_ADMIN[36]}: $c<br" . XHTML . ">\n";
return $msg;
}
***************
*** 1646,1650 ****
switch($fieldname) {
case "delete":
! $retval = "<input type=\"checkbox\" name=\"delitem[{$A['eid']}]\" checked=\"checked\">";
break;
case "edit":
--- 1648,1652 ----
switch($fieldname) {
case "delete":
! $retval = "<input type=\"checkbox\" name=\"delitem[{$A['eid']}]\" checked=\"checked\"" . XHTML . ">";
break;
case "edit":
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/plugins/calendar/language english.php, 1.12, 1.13 english_utf-8.php, 1.2, 1.3 japanese.php, 1.3, 1.4 japanese_utf-8.php, 1.3, 1.4
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/plugins/calendar/templates/admin batchdelete.thtml, 1.3, 1.4 eventeditor.thtml, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list