[svn r20467] FS#306 - The html-implemented conferention tool: Improvements for better encoding support.

skala
Ivan Tcholakov 16 years ago
parent 5060ac0676
commit 2d0a547960
  1. 1
      main/online/header_frame.inc.php
  2. 4
      main/online/online.php
  3. 4
      main/online/online_chat.php
  4. 12
      main/online/online_links.php
  5. 10
      main/online/online_master.php
  6. 6
      main/online/online_message.php
  7. 6
      main/online/online_streaming.php
  8. 4
      main/online/online_whoisonline.php

@ -64,6 +64,7 @@ elseif(FRAME == 'message')
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<?php /* Encoding is directly set here, to be fixed. */ ?>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Online Conference</title>

@ -1,4 +1,4 @@
<?php // $Id: online.php 18433 2009-02-11 14:58:51Z cvargas1 $
<?php // $Id: online.php 20467 2009-05-11 08:38:29Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -43,7 +43,7 @@ event_access_tool(TOOL_CONFERENCE);
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>">
<title>Online Conference</title>
</head>

@ -108,8 +108,8 @@ if($isMaster)
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?rand=<?php echo $rand; ?>&reset=1#bottom" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmReset'),ENT_QUOTES,$charset)); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('ClearList'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="99%">&nbsp;<a href="<?php echo api_get_self(); ?>?rand=<?php echo $rand; ?>&reset=1#bottom" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmReset'),ENT_QUOTES,$charset)); ?>')) return false;"><?php echo get_lang('ClearList'); ?></a></td>
<td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?rand=<?php echo $rand; ?>&reset=1#bottom" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmReset'),ENT_QUOTES,$charset)); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('ClearList'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="99%">&nbsp;<a href="<?php echo api_get_self(); ?>?rand=<?php echo $rand; ?>&reset=1#bottom" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmReset'),ENT_QUOTES,$charset)); ?>')) return false;"><?php echo get_lang('ClearList'); ?></a></td>
</tr>
</table>

@ -1,4 +1,4 @@
<?php // $Id: online_links.php 13296 2007-09-27 02:19:40Z yannoo $
<?php // $Id: online_links.php 20467 2009-05-11 08:38:29Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -171,7 +171,7 @@ include('header_frame.inc.php');
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="1%" valign="middle"><a href="online_master.php"><img src="../img/home.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Back'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="online_master.php"><img src="../img/home.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('Back'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="99%" align="left">&nbsp;<a href="online_master.php"><?php echo get_lang('Back'); ?></a></td>
</tr>
</table>
@ -183,7 +183,7 @@ include('header_frame.inc.php');
<table border="0" cellpadding="3" cellspacing="0">
<tr>
<td width="45%"><?php echo get_lang('LinkName'); ?> :</td>
<td width="55%"><input type="text" name="link_name" size="10" maxlength="50" value="<?php if($action == 'edit') echo htmlentities($link_name,ENT_QUOTES,$charset); ?>" style="width: 95px;"></td>
<td width="55%"><input type="text" name="link_name" size="10" maxlength="50" value="<?php if($action == 'edit') echo api_htmlentities($link_name,ENT_QUOTES,$charset); ?>" style="width: 95px;"></td>
</tr>
<tr>
<td width="45%"><?php echo get_lang('LinkURL'); ?> :</td>
@ -195,7 +195,7 @@ include('header_frame.inc.php');
</tr>
<tr>
<td colspan="2" align="center">
<input type="submit" value="<?php echo htmlentities(get_lang('Ok'),ENT_QUOTES,$charset); ?>">
<input type="submit" value="<?php echo api_htmlentities(' '.get_lang('Ok').' ',ENT_QUOTES,$charset); ?>">
</td>
</tr>
</table>
@ -221,8 +221,8 @@ else
<tr>
<td width="98%"><a href="online_goto.php?url=<?php echo urlencode($enreg['url']); ?>" target="online_working_area"><?php echo $enreg['name']; ?></a></td>
<td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?action=edit&link=<?php echo $enreg['id']; ?>"><img src="../img/edit.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?action=delete&link=<?php echo $enreg['id']; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Delete'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?action=edit&link=<?php echo $enreg['id']; ?>"><img src="../img/edit.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="<?php echo api_get_self(); ?>?action=delete&link=<?php echo $enreg['id']; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)); ?>')) return false;"><img src="../img/delete.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('Delete'),ENT_QUOTES,$charset); ?>"></a></td>
</tr>
<?php

@ -1,4 +1,4 @@
<?php // $Id: online_master.php 13296 2007-09-27 02:19:40Z yannoo $
<?php // $Id: online_master.php 20467 2009-05-11 08:38:29Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -126,10 +126,10 @@ include('header_frame.inc.php');
<?php if($isMaster): ?>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="1%" valign="middle"><a href="online_streaming.php"><img src="../img/conf.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Streaming'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="online_streaming.php"><img src="../img/conf.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('Streaming'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="49%" align="left" nowrap="nowrap">&nbsp;<a href="online_streaming.php"><?php echo get_lang('Streaming'); ?></a></td>
<td width="49%" align="right" nowrap="nowrap"><a href="online_htmlarea.php" target="online_working_area"><?php echo get_lang('WhiteBoard'); ?></a>&nbsp;</td>
<td width="1%" valign="middle"><a href="online_htmlarea.php" target="online_working_area"><img src="../img/works.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('WhiteBoard'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="online_htmlarea.php" target="online_working_area"><img src="../img/works.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('WhiteBoard'),ENT_QUOTES,$charset); ?>"></a></td>
</tr>
</table>
@ -199,10 +199,10 @@ if(!$isMaster && !empty($stream_url))
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="1%" valign="middle"><a href="online_links.php"><img src="../img/links.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Links'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="online_links.php"><img src="../img/links.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('Links'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="49%" align="left" nowrap="nowrap">&nbsp;<a href="online_links.php"><?php echo get_lang('Links'); ?></a></td>
<td width="49%" align="right" nowrap="nowrap"><a href="online_working_area.php" target="online_working_area"><?php echo get_lang('Home'); ?></a>&nbsp;</td>
<td width="1%" valign="middle"><a href="online_working_area.php" target="online_working_area"><img src="../img/home.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Home'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="online_working_area.php" target="online_working_area"><img src="../img/home.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('Home'),ENT_QUOTES,$charset); ?>"></a></td>
</tr>
</table>
<?php endif; ?>

@ -1,4 +1,4 @@
<?php // $Id: online_message.php 13296 2007-09-27 02:19:40Z yannoo $
<?php // $Id: online_message.php 20467 2009-05-11 08:38:29Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -114,12 +114,12 @@ if($sent)
include('header_frame.inc.php');
?>
<form name="formMessage" method="post" action="<?php echo api_get_self(); ?>" onsubmit="javascript:if(document.formMessage.message.value == '') { alert('<?php echo addslashes(htmlentities(get_lang('TypeMessage'),ENT_QUOTES,$charset)); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
<form name="formMessage" method="post" action="<?php echo api_get_self(); ?>" onsubmit="javascript:if(document.formMessage.message.value == '') { alert('<?php echo addslashes(api_htmlentities(get_lang('TypeMessage'),ENT_QUOTES,$charset)); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
<input type="hidden" name="sent" value="1">
<table border="0" cellpadding="5" cellspacing="0" width="100%">
<tr>
<td width="90%"><input type="text" name="message" size="50" value="" style="width: 100%;"></td>
<td width="9%" nowrap="nowrap"><?php echo get_lang('Question'); ?>&nbsp;<input type="checkbox" name="question" value="1" style="vertical-align: middle;" onclick="javascript:if(this.checked == true && !confirm('<?php echo addslashes(htmlentities(get_lang('OnlyCheckForImportantQuestion'),ENT_QUOTES,$charset)); ?>')) this.checked=false; document.formMessage.message.focus();"></td>
<td width="9%" nowrap="nowrap"><?php echo get_lang('Question'); ?>&nbsp;<input type="checkbox" name="question" value="1" style="vertical-align: middle;" onclick="javascript:if(this.checked == true && !confirm('<?php echo addslashes(api_htmlentities(get_lang('OnlyCheckForImportantQuestion'),ENT_QUOTES,$charset)); ?>')) this.checked=false; document.formMessage.message.focus();"></td>
<td width="1%"><input type="submit" value="OK" style="width: 30px;"></td>
</tr>
</table>

@ -1,4 +1,4 @@
<?php // $Id: online_streaming.php 13296 2007-09-27 02:19:40Z yannoo $
<?php // $Id: online_streaming.php 20467 2009-05-11 08:38:29Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -95,7 +95,7 @@ include('header_frame.inc.php');
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td width="1%" valign="middle"><a href="online_master.php"><img src="../img/home.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Back'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="1%" valign="middle"><a href="online_master.php"><img src="../img/home.gif" border="0" alt="" title="<?php echo api_htmlentities(get_lang('Back'),ENT_QUOTES,$charset); ?>"></a></td>
<td width="99%" align="left">&nbsp;<a href="online_master.php"><?php echo get_lang('Back'); ?></a></td>
</tr>
</table>
@ -118,7 +118,7 @@ include('header_frame.inc.php');
</td>
</tr>
<tr>
<td colspan="2" align="center"><input type="submit" value="<?php echo htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>"></td>
<td colspan="2" align="center"><input type="submit" value="<?php echo api_htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>"></td>
</tr>
</table>
</form>

@ -1,4 +1,4 @@
<?php // $Id: online_whoisonline.php 12269 2007-05-03 14:17:37Z elixir_julian $
<?php // $Id: online_whoisonline.php 20467 2009-05-11 08:38:29Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -79,7 +79,7 @@ foreach($Users as $enreg)
<td width="99%"><a <?php if($enreg['status'] == 1) echo 'class="master"'; ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo api_get_self(); ?>?showPic=<?php if($showPic == $enreg['user_id']) echo '0'; else echo $enreg['user_id']; ?>#user_<?php echo $enreg['user_id']; ?>"><b><?php echo $enreg['username']; ?></b></a></td>
</tr>
<tr>
<td width="99%"><small><?php echo ucfirst($enreg['lastname']).' '.ucfirst($enreg['firstname']); ?></small></td>
<td width="99%"><small><?php echo api_ucfirst($enreg['lastname']).' '.api_ucfirst($enreg['firstname']); ?></small></td>
</tr>
<?php if($showPic == $enreg['user_id']): ?>

Loading…
Cancel
Save