diff --git a/message/discussion.php b/message/discussion.php index 29ec2e7df24..d0211aaaf66 100644 --- a/message/discussion.php +++ b/message/discussion.php @@ -30,16 +30,16 @@ <?php echo get_string('discussion', 'message').': '.fullname($user) ?> - - - - - - - Sorry, but support for Frames is required to use Messaging + + <body>Sorry, but support for Frames is required to use Messaging</body> + + + + + diff --git a/message/history.php b/message/history.php index 68fc4929e58..3851fee2a04 100644 --- a/message/history.php +++ b/message/history.php @@ -35,7 +35,7 @@ /// Our two users are defined - let's set up the page - print_header(get_string('messagehistory', 'message'), '', '', '', ''); + print_header(get_string('messagehistory', 'message'), '', '', '', ''); /// Print out a heading including the users we are looking at @@ -46,8 +46,8 @@ echo fullname($user1); echo ''; echo ''; - echo ''.get_string('from').''; - echo ''.get_string('to').''; + echo ''.get_string('from').''; + echo ''.get_string('to').''; echo ''; echo ''; echo print_user_picture($user2->id, SITEID, $user2->picture, 100, true, true, 'userwindow').'
'; @@ -84,5 +84,6 @@ print_heading(get_string('nomessagesfound', 'message')); } + print_footer('none'); ?> diff --git a/message/index.php b/message/index.php index b9f93314ede..9bdf89cda92 100644 --- a/message/index.php +++ b/message/index.php @@ -88,5 +88,6 @@ } echo ' '; - echo ' '; + print_footer('none'); + ?> diff --git a/message/lib.php b/message/lib.php index 3a738fd0cf6..91082316ec5 100644 --- a/message/lib.php +++ b/message/lib.php @@ -591,8 +591,8 @@ function message_contact_link($userid, $linktype='add', $return=false, $script=" $output = ''. ''. - ''.$string.''. + '&sesskey='.sesskey().'" title="'.s($string).'">'. + ''.s($string).''. $text.''; if ($return) { @@ -623,9 +623,9 @@ function message_history_link($userid1, $userid2=0, $returnstr=false, $keywords= } if ($linktext == 'icon') { // Icon only - $fulllink = ''.$strmessagehistory.''; + $fulllink = ''.$strmessagehistory.''; } else if ($linktext == 'both') { // Icon and standard name - $fulllink = ''.$strmessagehistory.''; + $fulllink = ''.$strmessagehistory.''; $fulllink .= ' '.$strmessagehistory; } else if ($linktext) { // Custom name $fulllink = $linktext; diff --git a/message/send.php b/message/send.php index 152555bed8a..aea5d2fdd18 100644 --- a/message/send.php +++ b/message/send.php @@ -27,8 +27,8 @@ } @header('Content-Type: text/html; charset=utf-8'); - echo "\n"; - echo "\n\n"; + echo ''."\n"; + echo "\n\n"; echo ''; echo $stylesheetshtml; @@ -85,7 +85,7 @@ add_to_log(SITEID, 'message', 'write', 'history.php?user1='.$user->id.'&user2='.$USER->id.'#m'.$messageid, $user->id); } - echo ''; + echo ''; echo ''; diff --git a/message/user.php b/message/user.php index 13c213cb595..98846c3717f 100644 --- a/message/user.php +++ b/message/user.php @@ -49,7 +49,7 @@ message_unblock_contact($unblockcontact); } - print_header('','','','','',false,'','',false,'leftmargin="2" topmargin="2" marginwidth="2" marginheight="2"'); + print_header('','','','','',false,'','',false,''); echo ''; echo ''; @@ -87,6 +87,6 @@ echo '
'; echo print_user_picture($user->id, SITEID, $user->picture, true, true, true, 'userwindow').'
'; - echo ''; // Close possible theme tables off + echo ''; // Close possible theme tables off ?>