Skip to content

Commit

Permalink
Merge branch 'w43_MDL-29925_m19_calendar' of git://github.com/skodak/…
Browse files Browse the repository at this point in the history 
…moodle into MOODLE_19_STABLE
  • Loading branch information
Sam Hemelryk committed Oct 31, 2011
2 parents 6720535 + e311b14 commit 01c33e8
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 56 deletions.
6 changes: 3 additions & 3 deletions calendar/event.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
$eventid = optional_param('id', 0, PARAM_INT);
$eventtype = optional_param('type', 'select', PARAM_ALPHA);
$urlcourse = optional_param('course', 0, PARAM_INT);
$cal_y = optional_param('cal_y');
$cal_m = optional_param('cal_m');
$cal_d = optional_param('cal_d');
$cal_y = optional_param('cal_y', 0, PARAM_INT);
$cal_m = optional_param('cal_m', 0, PARAM_INT);
$cal_d = optional_param('cal_d', 0, PARAM_INT);

if(isguest()) {
// Guests cannot do anything with events
Expand Down
21 changes: 10 additions & 11 deletions calendar/set.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,14 @@
require_once('../config.php');
require_once($CFG->dirroot.'/calendar/lib.php');

$from = required_param('from');
$var = required_param('var');
$value = optional_param('value');
$id = optional_param('id');
$cal_d = optional_param('cal_d');
$cal_m = optional_param('cal_m');
$cal_y = optional_param('cal_y');
$action = optional_param('action');
$type = optional_param('type');
$from = required_param('from', PARAM_ALPHA);
$var = required_param('var', PARAM_ALPHA);
$id = optional_param('id', 0, PARAM_INT);
$cal_d = optional_param('cal_d', 0, PARAM_INT);
$cal_m = optional_param('cal_m', 0, PARAM_INT);
$cal_y = optional_param('cal_y', 0, PARAM_INT);
$action = optional_param('action', '', PARAM_ALPHA);
$type = optional_param('type', '', PARAM_ALPHA);

// Initialize the session variables
calendar_session_vars();
Expand Down Expand Up @@ -107,7 +106,7 @@

switch($from) {
case 'event':
redirect(CALENDAR_URL.'event.php?action='.$action.'&type='.$type.'&id='.intval($id));
redirect(CALENDAR_URL.'event.php?action='.$action.'&type='.$type.'&id='.$id);
break;
case 'month':
redirect(CALENDAR_URL.'view.php?view=month'.$courseid.'&cal_d='.$cal_d.'&cal_m='.$cal_m.'&cal_y='.$cal_y);
Expand All @@ -119,7 +118,7 @@
redirect(CALENDAR_URL.'view.php?view=day'.$courseid.'&cal_d='.$cal_d.'&cal_m='.$cal_m.'&cal_y='.$cal_y);
break;
case 'course':
redirect($CFG->wwwroot.'/course/view.php?id='.intval($id));
redirect($CFG->wwwroot.'/course/view.php?id='.$id);
break;
default:

Expand Down
32 changes: 16 additions & 16 deletions calendar/view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
}

// Now display all the calendar
for($day = 1; $day <= $display->maxdays; ++$day, ++$dayweek) {
for($aday = 1; $aday <= $display->maxdays; ++$aday, ++$dayweek) {
if($dayweek > $display->maxwday) {
// We need to change week (table row)
echo "</tr>\n<tr>";
Expand All @@ -436,7 +436,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course

// Reset vars
$cell = '';
$dayhref = calendar_get_link_href(CALENDAR_URL.'view.php?view=day&amp;course='.$courseid.'&amp;', $day, $m, $y);
$dayhref = calendar_get_link_href(CALENDAR_URL.'view.php?view=day&amp;course='.$courseid.'&amp;', $aday, $m, $y);

if(CALENDAR_WEEKEND & (1 << ($dayweek % 7))) {
// Weekend. This is true no matter what the exact range is.
Expand All @@ -448,35 +448,35 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
}

// Special visual fx if an event is defined
if(isset($eventsbyday[$day])) {
if(count($eventsbyday[$day]) == 1) {
if(isset($eventsbyday[$aday])) {
if(count($eventsbyday[$aday]) == 1) {
$title = get_string('oneevent', 'calendar');
}
else {
$title = get_string('manyevents', 'calendar', count($eventsbyday[$day]));
$title = get_string('manyevents', 'calendar', count($eventsbyday[$aday]));
}
$cell = '<div class="day"><a href="'.$dayhref.'" title="'.$title.'">'.$day.'</a></div>';
$cell = '<div class="day"><a href="'.$dayhref.'" title="'.$title.'">'.$aday.'</a></div>';
}
else {
$cell = '<div class="day">'.$day.'</div>';
$cell = '<div class="day">'.$aday.'</div>';
}

// Special visual fx if an event spans many days
if(isset($typesbyday[$day]['durationglobal'])) {
if(isset($typesbyday[$aday]['durationglobal'])) {
$class .= ' duration_global';
}
else if(isset($typesbyday[$day]['durationcourse'])) {
else if(isset($typesbyday[$aday]['durationcourse'])) {
$class .= ' duration_course';
}
else if(isset($typesbyday[$day]['durationgroup'])) {
else if(isset($typesbyday[$aday]['durationgroup'])) {
$class .= ' duration_group';
}
else if(isset($typesbyday[$day]['durationuser'])) {
else if(isset($typesbyday[$aday]['durationuser'])) {
$class .= ' duration_user';
}

// Special visual fx for today
if($display->thismonth && $day == $d) {
if($display->thismonth && $aday == $d) {
$class .= ' today';
} else {
$class .= ' nottoday';
Expand All @@ -488,9 +488,9 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
}
echo '<td'.$class.'>'.$cell;

if(isset($eventsbyday[$day])) {
if(isset($eventsbyday[$aday])) {
echo '<ul class="events-new">';
foreach($eventsbyday[$day] as $eventindex) {
foreach($eventsbyday[$aday] as $eventindex) {

// If event has a class set then add it to the event <li> tag
$eventclass = '';
Expand All @@ -502,9 +502,9 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users, $course
}
echo '</ul>';
}
if(isset($durationbyday[$day])) {
if(isset($durationbyday[$aday])) {
echo '<ul class="events-underway">';
foreach($durationbyday[$day] as $eventindex) {
foreach($durationbyday[$aday] as $eventindex) {
echo '<li>['.format_string($events[$eventindex]->name,true).']</li>';
}
echo '</ul>';
Expand Down
54 changes: 28 additions & 26 deletions lib/weblib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6203,8 +6203,35 @@ function redirect($url, $message='', $delay=-1) {

$message = clean_text($message);

// Technically, HTTP/1.1 requires Location: header to contain the absolute path.
// (In practice browsers accept relative paths - but still, might as well do it properly.)
// This code turns relative into absolute.
if (!preg_match('|^[a-z]+:|', $url)) {
// Get host name http://www.wherever.com
$hostpart = preg_replace('|^(.*?[^:/])/.*$|', '$1', $CFG->wwwroot);
if (preg_match('|^/|', $url)) {
// URLs beginning with / are relative to web server root so we just add them in
$url = $hostpart.$url;
} else {
// URLs not beginning with / are relative to path of current script, so add that on.
$url = $hostpart.preg_replace('|\?.*$|','',me()).'/../'.$url;
}
// Replace all ..s
while (true) {
$newurl = preg_replace('|/(?!\.\.)[^/]*/\.\./|', '/', $url);
if ($newurl == $url) {
break;
}
$url = $newurl;
}
}

// Sanitise url - we can not rely on our URL cleaning
// because it does not support all valid external URLs
$url = preg_replace('/[\x00-\x1F\x7F]/', '', $url);
$url = str_replace('"', '%22', $url);
$encodedurl = preg_replace("/\&(?![a-zA-Z0-9#]{1,8};)/", "&amp;", $url);
$encodedurl = preg_replace('/^.*href="([^"]*)".*$/', "\\1", clean_text('<a href="'.$encodedurl.'" />'));
$encodedurl = preg_replace('/^.*href="([^"]*)".*$/', "\\1", clean_text('<a href="'.$encodedurl.'" />', FORMAT_HTML));
$url = str_replace('&amp;', '&', $encodedurl);

/// At developer debug level. Don't redirect if errors have been printed on screen.
Expand All @@ -6226,31 +6253,6 @@ function redirect($url, $message='', $delay=-1) {

/// when no message and header printed yet, try to redirect
if (empty($message) and !defined('HEADER_PRINTED')) {

// Technically, HTTP/1.1 requires Location: header to contain
// the absolute path. (In practice browsers accept relative
// paths - but still, might as well do it properly.)
// This code turns relative into absolute.
if (!preg_match('|^[a-z]+:|', $url)) {
// Get host name http://www.wherever.com
$hostpart = preg_replace('|^(.*?[^:/])/.*$|', '$1', $CFG->wwwroot);
if (preg_match('|^/|', $url)) {
// URLs beginning with / are relative to web server root so we just add them in
$url = $hostpart.$url;
} else {
// URLs not beginning with / are relative to path of current script, so add that on.
$url = $hostpart.preg_replace('|\?.*$|','',me()).'/../'.$url;
}
// Replace all ..s
while (true) {
$newurl = preg_replace('|/(?!\.\.)[^/]*/\.\./|', '/', $url);
if ($newurl == $url) {
break;
}
$url = $newurl;
}
}

$delay = 0;
//try header redirection first
@header($_SERVER['SERVER_PROTOCOL'] . ' 303 See Other'); //302 might not work for POST requests, 303 is ignored by obsolete clients
Expand Down

0 comments on commit 01c33e8

Please sign in to comment.