chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge

Browse Source
skala
Julio Montoya 16 years ago
parent b6d0508192 07cc56ed9f
commit 6a1abd696f
6 changed files with 32 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 29
      main/auth/my_progress.php
  2. 2
      main/document/document.inc.php
  3. 4
      main/document/edit_document.php
  4. 2
      main/inc/lib/tracking.lib.php
  5. 13
      main/wiki/index.php
  6. 8
      main/wiki/wiki.inc.php

29
main/auth/my_progress.php
Unescape View File

@ -139,7 +139,12 @@ foreach ($courses as $enreg) {
$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_course_lp_view = Database :: get_course_table(TABLE_LP_VIEW, $course_info['db_name']);
$tbl_course_lp_view_item = Database :: get_course_table(TABLE_LP_ITEM_VIEW, $course_info['db_name']);
$tbl_course_lp = Database :: get_course_table(TABLE_LP_MAIN, $course_info['db_name']);
$tbl_course_lp_item = Database :: get_course_table(TABLE_LP_ITEM, $course_info['db_name']);
$tbl_course_quiz = Database :: get_course_table(TABLE_QUIZ_TEST, $course_info['db_name']);
$sql = 'SELECT id_session
FROM '.$tbl_session_course_user.' session_course_user
WHERE session_course_user.id_user = '.intval($_user['user_id']).'
@ -200,7 +205,7 @@ foreach ($courses as $enreg) {
<th class="head" style="color:#000"><?php echo get_lang('LastConnexion'); ?></th>
</tr>
<?php
$sql_learnpath = "SELECT lp.name,lp.id FROM ".$course_info['db_name'].".".$tbl_course_lp." AS lp";
$sql_learnpath = "SELECT lp.name,lp.id FROM ".$tbl_course_lp." AS lp";
$result_learnpath = Database::query($sql_learnpath);
if (Database::num_rows($result_learnpath) > 0) {
while($learnpath = Database::fetch_array($result_learnpath)) {
@ -208,8 +213,8 @@ foreach ($courses as $enreg) {
// calculates last connection time
$sql = 'SELECT MAX(start_time)
FROM '.$course_info['db_name'].'.'.$tbl_course_lp_view_item.' AS item_view
INNER JOIN '.$course_info['db_name'].'.'.$tbl_course_lp_view.' AS view
FROM '.$tbl_course_lp_view_item.' AS item_view
INNER JOIN '.$tbl_course_lp_view.' AS view
ON item_view.lp_view_id = view.id
AND view.lp_id = '.$learnpath['id'].'
AND view.user_id = '.$_user['user_id'];
@ -218,8 +223,8 @@ foreach ($courses as $enreg) {
// calculates time
$sql = 'SELECT SUM(total_time)
FROM '.$course_info['db_name'].'.'.$tbl_course_lp_view_item.' AS item_view
INNER JOIN '.$course_info['db_name'].'.'.$tbl_course_lp_view.' AS view
FROM '.$tbl_course_lp_view_item.' AS item_view
INNER JOIN '.$tbl_course_lp_view.' AS view
ON item_view.lp_view_id = view.id
AND view.lp_id = '.$learnpath['id'].'
AND view.user_id = '.$_user['user_id'];
@ -256,12 +261,12 @@ foreach ($courses as $enreg) {
} else {
echo " <tr>
<td colspan='4'>
".get_lang('NoLearnpath')."
echo ' <tr>
<td colspan="4" align="center">
'.get_lang('NoLearnpath').'
</td>
</tr>
";
';
}
?>
<tr>
@ -278,7 +283,7 @@ foreach ($courses as $enreg) {
if (Database::result($result_visibility_tests, 0, 'visibility') == 1) {*/
$sql_exercices = " SELECT quiz.title,id, results_disabled
FROM ".$course_info['db_name'].".".$tbl_course_quiz." AS quiz
FROM ".$tbl_course_quiz." AS quiz
WHERE active='1'";
$result_exercices = Database::query($sql_exercices);
@ -356,7 +361,7 @@ foreach ($courses as $enreg) {
echo '</tr>';
}
} else {
echo '<tr><td colspan="4">'.get_lang('NoEx').'</td></tr>';
echo '<tr><td colspan="4" align="center">'.get_lang('NoEx').'</td></tr>';
}
/*} else {
echo '<tr><td colspan="4">'.get_lang('NoEx').'</td></tr>';

2
main/document/document.inc.php
Unescape View File

@ -130,7 +130,7 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
$ext = explode('.', $path);
$ext = strtolower($ext[sizeof($ext) - 1]);
// "htmlfiles" are shown in a frameset
if ($ext == 'htm' || $ext == 'html' || $ext == 'gif' || $ext == 'jpg' || $ext == 'jpeg' || $ext == 'png') {
if ($ext == 'htm' || $ext == 'html' || $ext == 'gif' || $ext == 'jpg' || $ext == 'jpeg' || $ext == 'png' || $ext == 'pdf' || $ext == 'swf' || $ext == 'mp3') {
$url = 'showinframes.php?'.api_get_cidreq().'&amp;file='.$url_path.$req_gid;
} else {
// url-encode for problematic characters (we may not call them dangerous characters...)

4
main/document/edit_document.php
Unescape View File

@ -592,8 +592,8 @@ function nav_to_slideshow($slide_id) {
$path = Security::remove_XSS($_GET['curdirpath']);
$pathurl = urlencode($path);
echo '<div class="actions">';
echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png').get_lang('BackTo').' '.get_lang('DocumentsOverview').'</a>&nbsp;';
//echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ViewSlideshow')).get_lang('BackTo').' '.get_lang('ViewSlideshow').'</a>';
//echo '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png').get_lang('BackTo').' '.get_lang('DocumentsOverview').'</a>&nbsp;';
echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ViewSlideshow')).get_lang('BackTo').' '.get_lang('ViewSlideshow').'</a>';
echo '</div>';
}

2
main/inc/lib/tracking.lib.php
Unescape View File

@ -1655,7 +1655,7 @@ class Tracking {
$lp_view_id = intval(Database::result($rs_last_lp_view_id,0,'id'));
$sql_list_view='SELECT li.max_score,lv.user_id,liw.score,((liw.score/li.max_score)*100) as sum_data FROM '.$lp_item_table.' li INNER JOIN '.$lp_view_table.' lv
ON li.lp_id=lv.lp_id INNER JOIN '.$lp_item_view_table.' liw ON liw.lp_item_id=li.id WHERE lv.user_id="'.$user_id.'" AND li.item_type="sco" AND liw.lp_view_id="'.$lp_view_id.'"';
ON li.lp_id=lv.lp_id INNER JOIN '.$lp_item_view_table.' liw ON liw.lp_item_id=li.id WHERE lv.user_id="'.$user_id.'" AND (li.item_type="sco" OR li.item_type="quiz") AND liw.lp_view_id="'.$lp_view_id.'"';
$tot=0;
$sum=0;

13
main/wiki/index.php
Unescape View File

@ -452,6 +452,13 @@ if (!in_array($_GET['action'], array('addnew', 'searchpages', 'allpages', 'recen
echo '</div>';
}
//In new pages go to new page
if (isset($_POST['SaveWikiNew']))
{
display_wiki_entry(Security::remove_XSS($_POST['reflink']));
}
/////////////////////// more options /////////////////////// Juan Carlos Raña Trabado
//more for export to course document area. See display_wiki_entry
@ -2346,12 +2353,6 @@ if ($_GET['action']=='discuss')
}
}
///in new pages go to new page
if ($_POST['SaveWikiNew'])
{
display_wiki_entry(Security::remove_XSS($_POST['reflink']));
}
echo "</div>"; // echo "<div id='mainwiki'>";
echo "</div>"; // echo "<div id='wikiwrapper'>";

8
main/wiki/wiki.inc.php
Unescape View File

@ -958,12 +958,12 @@ function word_count($document) {
# strip all html tags
$wc = strip_tags($document);
//remove words and remove one letter words commented temporarily because of problems with utf8 support. TODO: fix and enable
# remove 'words' that don't consist of alphanumerical characters or punctuation
$pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]+#";
$wc = trim(preg_replace($pattern, " ", $wc));
//$pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]+#";
//$wc = trim(preg_replace($pattern, " ", $wc));
# remove one-letter 'words' that consist only of punctuation
$wc = trim(preg_replace("#\s*[(\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]\s*#", " ", $wc));
//$wc = trim(preg_replace("#\s*[(\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@)]\s*#", " ", $wc)); //
# remove superfluous whitespace
$wc = preg_replace("/\s\s+/", " ", $wc);

Write Preview
Loading…
Cancel
Save