Prechádzať zdrojové kódy

Merge branch '1.9.x' of github.com:aragonc/chamilo-lms into 1.9.x

aragonc 10 rokov pred
rodič
commit
868d16da57
100 zmenil súbory, kde vykonal 367 pridanie a 209 odobranie
  1. 2 2
      main/chat/chat.php
  2. 50 42
      main/chat/chat_message.php
  3. 3 2
      main/chat/chat_whoisonline.php
  4. 20 14
      main/chat/header_frame.inc.php
  5. BIN
      main/chat/sound/sonido_notificacion.mp3
  6. BIN
      main/chat/sound/sonido_notificacion.ogg
  7. BIN
      main/chat/sound/sonido_notificacion.wav
  8. 60 60
      main/css/chat.css
  9. BIN
      main/img/emoticons/flag_green_small.png
  10. BIN
      main/img/emoticons/flag_red_small.png
  11. BIN
      main/img/emoticons/flag_yellow_small.png
  12. BIN
      main/img/emoticons/icon_angry.png
  13. BIN
      main/img/emoticons/icon_arrow.png
  14. BIN
      main/img/emoticons/icon_biggrin.png
  15. BIN
      main/img/emoticons/icon_confused.png
  16. BIN
      main/img/emoticons/icon_cool.png
  17. BIN
      main/img/emoticons/icon_eek.png
  18. BIN
      main/img/emoticons/icon_exclaim.png
  19. BIN
      main/img/emoticons/icon_hand.png
  20. BIN
      main/img/emoticons/icon_idea.png
  21. BIN
      main/img/emoticons/icon_mourn.png
  22. BIN
      main/img/emoticons/icon_neutral.png
  23. BIN
      main/img/emoticons/icon_question.png
  24. BIN
      main/img/emoticons/icon_razz.png
  25. BIN
      main/img/emoticons/icon_redface.png
  26. BIN
      main/img/emoticons/icon_sad.png
  27. BIN
      main/img/emoticons/icon_shhh.png
  28. BIN
      main/img/emoticons/icon_silenced.png
  29. BIN
      main/img/emoticons/icon_smile.png
  30. BIN
      main/img/emoticons/icon_surprised.png
  31. BIN
      main/img/emoticons/icon_think.png
  32. BIN
      main/img/emoticons/icon_wink.png
  33. BIN
      main/img/emoticons/waiting.png
  34. 4 4
      main/inc/ajax/model.ajax.php
  35. 6 6
      main/inc/lib/course_home.lib.php
  36. 40 27
      main/inc/lib/formvalidator/Element/DatePicker.php
  37. 0 0
      main/inc/lib/formvalidator/Element/datepicker_old.php
  38. 12 11
      main/inc/lib/formvalidator/FormValidator.class.php
  39. 12 10
      main/inc/local.inc.php
  40. 0 1
      main/lang/arabic/tracking.inc.php
  41. 1 0
      main/lang/arabic/trad4all.inc.php
  42. 0 1
      main/lang/asturian/tracking.inc.php
  43. 1 0
      main/lang/asturian/trad4all.inc.php
  44. 0 1
      main/lang/basque/tracking.inc.php
  45. 1 0
      main/lang/basque/trad4all.inc.php
  46. 0 1
      main/lang/brazilian/tracking.inc.php
  47. 1 0
      main/lang/brazilian/trad4all.inc.php
  48. 0 1
      main/lang/bulgarian/tracking.inc.php
  49. 1 0
      main/lang/bulgarian/trad4all.inc.php
  50. 1 0
      main/lang/catalan/admin.inc.php
  51. 0 1
      main/lang/catalan/tracking.inc.php
  52. 1 0
      main/lang/catalan/trad4all.inc.php
  53. 1 0
      main/lang/catalan/work.inc.php
  54. 0 1
      main/lang/croatian/tracking.inc.php
  55. 1 0
      main/lang/croatian/trad4all.inc.php
  56. 0 1
      main/lang/danish/tracking.inc.php
  57. 1 0
      main/lang/danish/trad4all.inc.php
  58. 0 1
      main/lang/dutch/tracking.inc.php
  59. 1 0
      main/lang/dutch/trad4all.inc.php
  60. 0 1
      main/lang/english/admin.inc.php
  61. 1 1
      main/lang/english/courses.inc.php
  62. 1 1
      main/lang/english/exercice.inc.php
  63. 1 0
      main/lang/english/survey.inc.php
  64. 0 1
      main/lang/english/tracking.inc.php
  65. 0 1
      main/lang/esperanto/tracking.inc.php
  66. 1 0
      main/lang/esperanto/trad4all.inc.php
  67. 1 0
      main/lang/french/survey.inc.php
  68. 0 1
      main/lang/french/tracking.inc.php
  69. 13 0
      main/lang/french/trad4all.inc.php
  70. 0 1
      main/lang/galician/tracking.inc.php
  71. 1 0
      main/lang/galician/trad4all.inc.php
  72. 0 1
      main/lang/german/tracking.inc.php
  73. 1 0
      main/lang/german/trad4all.inc.php
  74. 0 1
      main/lang/greek/tracking.inc.php
  75. 1 0
      main/lang/greek/trad4all.inc.php
  76. 0 1
      main/lang/hungarian/tracking.inc.php
  77. 1 0
      main/lang/hungarian/trad4all.inc.php
  78. 0 1
      main/lang/indonesian/tracking.inc.php
  79. 1 0
      main/lang/indonesian/trad4all.inc.php
  80. 0 1
      main/lang/italian/tracking.inc.php
  81. 1 0
      main/lang/italian/trad4all.inc.php
  82. 0 1
      main/lang/korean/tracking.inc.php
  83. 1 0
      main/lang/korean/trad4all.inc.php
  84. 0 1
      main/lang/latvian/tracking.inc.php
  85. 1 0
      main/lang/latvian/trad4all.inc.php
  86. 0 1
      main/lang/lithuanian/tracking.inc.php
  87. 1 0
      main/lang/lithuanian/trad4all.inc.php
  88. 0 1
      main/lang/macedonian/tracking.inc.php
  89. 1 0
      main/lang/macedonian/trad4all.inc.php
  90. 0 1
      main/lang/malay/tracking.inc.php
  91. 1 0
      main/lang/malay/trad4all.inc.php
  92. 0 1
      main/lang/norwegian/tracking.inc.php
  93. 1 0
      main/lang/norwegian/trad4all.inc.php
  94. 0 1
      main/lang/persian/tracking.inc.php
  95. 1 0
      main/lang/persian/trad4all.inc.php
  96. 0 1
      main/lang/polish/tracking.inc.php
  97. 1 0
      main/lang/polish/trad4all.inc.php
  98. 114 1
      main/lang/portuguese/tracking.inc.php
  99. 1 0
      main/lang/portuguese/trad4all.inc.php
  100. 0 1
      main/lang/quechua_cusco/tracking.inc.php

+ 2 - 2
main/chat/chat.php

@@ -79,8 +79,8 @@ if (empty($open_chat_window)) {
 
 
 echo '<div class="page-chat">';
 echo '<div class="page-chat">';
 echo '<iframe src="chat_whoisonline.php?cidReq='.$cidreq.'" name="chat_whoisonline" scrolling="no" style="height:500px; width:35%; border: 0px none; float:left"></iframe>';
 echo '<iframe src="chat_whoisonline.php?cidReq='.$cidreq.'" name="chat_whoisonline" scrolling="no" style="height:500px; width:35%; border: 0px none; float:left"></iframe>';
-echo '<iframe src="chat_chat.php?origin='.$origin.'&target='.$target.'&amp;cidReq='.$cidreq.'" name="chat_chat" scrolling="auto" height="380" style="width:65%; border: 0px none; float:right"></iframe>';
-echo '<iframe src="chat_message.php?cidReq='.$cidreq.'" name="chat_message" scrolling="no" height="120" style="width:65%; border: 0px none; float:right"></iframe>';
+echo '<iframe src="chat_chat.php?origin='.$origin.'&target='.$target.'&amp;cidReq='.$cidreq.'" name="chat_chat" id="chat_chat" scrolling="auto" height="380" style="width:65%; border: 0px none; float:right"></iframe>';
+echo '<iframe src="chat_message.php?cidReq='.$cidreq.'" name="chat_message" scrolling="no" height="180" style="width:65%; border: 0px none; float:right"></iframe>';
 echo '<iframe src="chat_hidden.php?cidReq='.$cidreq.'" name="chat_hidden" height="0" style="border: 0px none"></iframe>';
 echo '<iframe src="chat_hidden.php?cidReq='.$cidreq.'" name="chat_hidden" height="0" style="border: 0px none"></iframe>';
 echo '</div>';
 echo '</div>';
 
 

+ 50 - 42
main/chat/chat_message.php

@@ -48,6 +48,7 @@ function close_chat_window() {
 	chat_window.opener = top.window.self;
 	chat_window.opener = top.window.self;
 	chat_window.top.close();
 	chat_window.top.close();
 }
 }
+
 </script>
 </script>
 
 
 <?php
 <?php
@@ -108,54 +109,56 @@ if (!empty($course) && !empty($_user['user_id'])) {
 
 
 	// Define emoticons
 	// Define emoticons
     $emoticon_text1 = ':-)';
     $emoticon_text1 = ':-)';
-    $emoticon_img1  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_smile.gif" alt="'.get_lang('Smile').'" title="'.get_lang('Smile').'" />';
+    $emoticon_img1  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_smile.png" alt="'.get_lang('Smile').'" title="'.get_lang('Smile').'" />';
     $emoticon_text2 = ':-D';
     $emoticon_text2 = ':-D';
-    $emoticon_img2  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_biggrin.gif" alt="'.get_lang('BigGrin').'" title="'.get_lang('BigGrin').'" />';
+    $emoticon_img2  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_biggrin.png" alt="'.get_lang('BigGrin').'" title="'.get_lang('BigGrin').'" />';
     $emoticon_text3 = ';-)';
     $emoticon_text3 = ';-)';
-    $emoticon_img3  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_wink.gif" alt="'.get_lang('Wink').'" title="'.get_lang('Wink').'" />';
+    $emoticon_img3  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_wink.png" alt="'.get_lang('Wink').'" title="'.get_lang('Wink').'" />';
     $emoticon_text4 = ':-P';
     $emoticon_text4 = ':-P';
-    $emoticon_img4  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_razz.gif" alt="'.get_lang('Avid').'" title="'.get_lang('Avid').'" />';
+    $emoticon_img4  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_razz.png" alt="'.get_lang('Avid').'" title="'.get_lang('Avid').'" />';
     $emoticon_text5 = '8-)';
     $emoticon_text5 = '8-)';
-    $emoticon_img5  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_cool.gif" alt="'.get_lang('Cool').'" title="'.get_lang('Cool').'" />';
+    $emoticon_img5  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_cool.png" alt="'.get_lang('Cool').'" title="'.get_lang('Cool').'" />';
     $emoticon_text6 = ':-o)';
     $emoticon_text6 = ':-o)';
-    $emoticon_img6  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_surprised.gif" alt="'.get_lang('Surprised').'" title="'.get_lang('Surprised').'" />';
+    $emoticon_img6  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_surprised.png" alt="'.get_lang('Surprised').'" title="'.get_lang('Surprised').'" />';
     $emoticon_text7 = '=;';
     $emoticon_text7 = '=;';
-    $emoticon_img7  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_hand.gif" alt="'.get_lang('Hand').'" title="'.get_lang('Hand').'" />';
+    $emoticon_img7  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_hand.png" alt="'.get_lang('Hand').'" title="'.get_lang('Hand').'" />';
     $emoticon_text8 = '=8-o';
     $emoticon_text8 = '=8-o';
-    $emoticon_img8  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_eek.gif" alt="'.get_lang('Amazing').'" title="'.get_lang('Amazing').'" />';
+    $emoticon_img8  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_eek.png" alt="'.get_lang('Amazing').'" title="'.get_lang('Amazing').'" />';
 	$emoticon_text9 = ':-|)';
 	$emoticon_text9 = ':-|)';
-	$emoticon_img9  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_neutral.gif" alt="'.get_lang('Neutral').'" title="'.get_lang('Neutral').'" />';
-	$emoticon_text8 = ':-k';
-	$emoticon_img8  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_think.gif" alt="'.get_lang('Think').'" title="'.get_lang('Think').'" />';
+	$emoticon_img9  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_neutral.png" alt="'.get_lang('Neutral').'" title="'.get_lang('Neutral').'" />';
+	$emoticon_text10 = ':-k';
+	$emoticon_img10  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_think.png" alt="'.get_lang('Think').'" title="'.get_lang('Think').'" />';
 	$emoticon_text11 = ':-?';
 	$emoticon_text11 = ':-?';
-	$emoticon_img11  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_confused.gif" alt="'.get_lang('Confused').'" title="'.get_lang('Confused').'" />';
+	$emoticon_img11  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_confused.png" alt="'.get_lang('Confused').'" title="'.get_lang('Confused').'" />';
 	$emoticon_text12 = ':-8';
 	$emoticon_text12 = ':-8';
-	$emoticon_img12  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_redface.gif" alt="'.get_lang('Redface').'" title="'.get_lang('Redface').'" />';
-	$emoticon_text13 = ':- = ';
-	$emoticon_img13  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_shhh.gif" alt="'.get_lang('Silence').'" title="'.get_lang('Silence').'" />';
+	$emoticon_img12  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_redface.png" alt="'.get_lang('Redface').'" title="'.get_lang('Redface').'" />';
+	$emoticon_text13 = ':-L';
+	$emoticon_img13  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_shhh.png" alt="'.get_lang('Silence').'" title="'.get_lang('Silence').'" />';
 	$emoticon_text14 = ':-#)';
 	$emoticon_text14 = ':-#)';
-	$emoticon_img14  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_silenced.gif" alt="'.get_lang('Silenced').'" title="'.get_lang('Silenced').'" />';
+	$emoticon_img14  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_silenced.png" alt="'.get_lang('Silenced').'" title="'.get_lang('Silenced').'" />';
 	$emoticon_text15 = ':-(';
 	$emoticon_text15 = ':-(';
-	$emoticon_img15  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_sad.gif" alt="'.get_lang('Sad').'" title="'.get_lang('Sad').'" />';
-	$emoticon_text16 = ':-[8';
-	$emoticon_img16  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_angry.gif" alt="'.get_lang('Angry').'" title="'.get_lang('Angry').'" />';
-	$emoticon_text17 = '--)';
-	$emoticon_img17  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_arrow.gif" alt="'.get_lang('Arrow').'" title="'.get_lang('Arrow').'" />';
-	$emoticon_text18 = ':!:';
-	$emoticon_img18  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_exclaim.gif" alt="'.get_lang('Exclamation').'" title="'.get_lang('Exclamation').'" />';
-	$emoticon_text19 = ':?:';
-	$emoticon_img19  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_question.gif" alt="'.get_lang('Question').'" title="'.get_lang('Question').'" />';
-	$emoticon_text20 = '0-';
-	$emoticon_img20  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/icon_idea.gif" alt="'.get_lang('Idea').'" title="'.get_lang('Idea').'" />';
+	$emoticon_img15  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_sad.png" alt="'.get_lang('Sad').'" title="'.get_lang('Sad').'" />';
+	$emoticon_text16 = ';-(';
+	$emoticon_img16  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_mourn.png" alt="'.get_lang('Weep').'" title="'.get_lang('Weep').'" />';
+	$emoticon_text17 = ':-[8';
+	$emoticon_img17  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_angry.png" alt="'.get_lang('Angry').'" title="'.get_lang('Angry').'" />';
+	$emoticon_text18 = '--)';
+	$emoticon_img18  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_arrow.png" alt="'.get_lang('Arrow').'" title="'.get_lang('Arrow').'" />';
+	$emoticon_text19 = ':!:';
+	$emoticon_img19  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_exclaim.png" alt="'.get_lang('Exclamation').'" title="'.get_lang('Exclamation').'" />';
+	$emoticon_text20 = ':?:';
+	$emoticon_img20  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_question.png" alt="'.get_lang('Question').'" title="'.get_lang('Question').'" />';
+	$emoticon_text21 = '0-';
+	$emoticon_img21  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/icon_idea.png" alt="'.get_lang('Idea').'" title="'.get_lang('Idea').'" />';
 
 
 	$emoticon_text201 = '*';
 	$emoticon_text201 = '*';
-	$emoticon_img201  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/waiting.gif" alt="'.get_lang('AskPermissionSpeak').'" title="'.get_lang('AskPermissionSpeak').'" />';
+	$emoticon_img201  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/waiting.png" alt="'.get_lang('AskPermissionSpeak').'" title="'.get_lang('AskPermissionSpeak').'" />';
 	$emoticon_text202 = ':speak:';
 	$emoticon_text202 = ':speak:';
-	$emoticon_img202  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/flag_green_small.gif" alt="'.get_lang('GiveTheFloorTo').'" title="'.get_lang('GiveTheFloorTo').'" />';
+	$emoticon_img202  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/flag_green_small.png" alt="'.get_lang('GiveTheFloorTo').'" title="'.get_lang('GiveTheFloorTo').'" />';
 	$emoticon_text203 = ':pause:';
 	$emoticon_text203 = ':pause:';
-	$emoticon_img203  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/flag_yellow_small.gif" alt="'.get_lang('Pause').'" title="'.get_lang('Pause').'" />';
+	$emoticon_img203  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/flag_yellow_small.png" alt="'.get_lang('Pause').'" title="'.get_lang('Pause').'" />';
 	$emoticon_text204 = ':stop:';
 	$emoticon_text204 = ':stop:';
-	$emoticon_img204  = '<img src="'.api_get_path(WEB_IMG_PATH).'smileys/flag_red_small.gif" alt="'.get_lang('Stop').'" title="'.get_lang('Stop').'" />';
+	$emoticon_img204  = '<img src="'.api_get_path(WEB_IMG_PATH).'emoticons/flag_red_small.png" alt="'.get_lang('Stop').'" title="'.get_lang('Stop').'" />';
 
 
 	if ($sent) {
 	if ($sent) {
 		$message = Security::remove_XSS(trim(htmlspecialchars(stripslashes($_POST['message']), ENT_QUOTES, $charset)));
 		$message = Security::remove_XSS(trim(htmlspecialchars(stripslashes($_POST['message']), ENT_QUOTES, $charset)));
@@ -168,7 +171,7 @@ if (!empty($course) && !empty($_user['user_id'])) {
 		$message = str_replace($emoticon_text7, $emoticon_img7, $message);
 		$message = str_replace($emoticon_text7, $emoticon_img7, $message);
 		$message = str_replace($emoticon_text8, $emoticon_img8, $message);
 		$message = str_replace($emoticon_text8, $emoticon_img8, $message);
 		$message = str_replace($emoticon_text9, $emoticon_img9, $message);
 		$message = str_replace($emoticon_text9, $emoticon_img9, $message);
-		//$message = str_replace($emoticon_text10, $emoticon_img10, $message);
+		$message = str_replace($emoticon_text10, $emoticon_img10, $message);
 		$message = str_replace($emoticon_text11, $emoticon_img11, $message);
 		$message = str_replace($emoticon_text11, $emoticon_img11, $message);
 		$message = str_replace($emoticon_text12, $emoticon_img12, $message);
 		$message = str_replace($emoticon_text12, $emoticon_img12, $message);
 		$message = str_replace($emoticon_text13, $emoticon_img13, $message);
 		$message = str_replace($emoticon_text13, $emoticon_img13, $message);
@@ -179,6 +182,7 @@ if (!empty($course) && !empty($_user['user_id'])) {
 		$message = str_replace($emoticon_text18, $emoticon_img18, $message);
 		$message = str_replace($emoticon_text18, $emoticon_img18, $message);
  		$message = str_replace($emoticon_text19, $emoticon_img19, $message);
  		$message = str_replace($emoticon_text19, $emoticon_img19, $message);
 		$message = str_replace($emoticon_text20, $emoticon_img20, $message);
 		$message = str_replace($emoticon_text20, $emoticon_img20, $message);
+		$message = str_replace($emoticon_text21, $emoticon_img21, $message);
 		//
 		//
 		$message = str_replace($emoticon_text201, $emoticon_img201, $message);
 		$message = str_replace($emoticon_text201, $emoticon_img201, $message);
 		$message = str_replace($emoticon_text202, $emoticon_img202, $message);
 		$message = str_replace($emoticon_text202, $emoticon_img202, $message);
@@ -238,19 +242,20 @@ if (!empty($course) && !empty($_user['user_id'])) {
 	?>
 	?>
 	<form name="formMessage" method="post" action="<?php echo api_get_self().'?'.api_get_cidreq(); ?>" onsubmit="javascript: if(document.formMessage.message.value == '') { alert('<?php echo addslashes(api_htmlentities(get_lang('TypeMessage'), ENT_QUOTES)); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
 	<form name="formMessage" method="post" action="<?php echo api_get_self().'?'.api_get_cidreq(); ?>" onsubmit="javascript: if(document.formMessage.message.value == '') { alert('<?php echo addslashes(api_htmlentities(get_lang('TypeMessage'), ENT_QUOTES)); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
 	<input type="hidden" name="sent" value="1">
 	<input type="hidden" name="sent" value="1">
+	<div class="message-form-chat">
 	<table border="0" cellpadding="5" cellspacing="0" width="100%">
 	<table border="0" cellpadding="5" cellspacing="0" width="100%">
 	<tr>
 	<tr>
         <td width="320" valign="middle">
         <td width="320" valign="middle">
 		<?php $talkboxsize=(api_get_course_setting('allow_open_chat_window')) ? 'width: 350px; height: 80px' : 'width: 450px; height: 35px'; ?>
 		<?php $talkboxsize=(api_get_course_setting('allow_open_chat_window')) ? 'width: 350px; height: 80px' : 'width: 450px; height: 35px'; ?>
-        <textarea class="message-text" name="message" style=" <?php echo $talkboxsize; ?>" onkeydown="send_message(event);" onclick="javascript: insert_smile(this);"></textarea>
+        <textarea id="message" class="message-text" name="message" style=" <?php echo $talkboxsize; ?>" onkeydown="send_message(event);" onclick="javascript: insert_smile(this);"></textarea>
         </td>
         </td>
         <td>
         <td>
-            <button type="submit" value="<?php echo get_lang('Send'); ?>" class="btn-enviar"><?php echo get_lang('Send'); ?></button>
+            <button id="send" type="submit" value="<?php echo get_lang('Send'); ?>" class="btn-enviar"><?php echo get_lang('Send'); ?></button>
         </td>
         </td>
 	</tr>
 	</tr>
-    <tr>
-        <td>
+	</table>
         <?php
         <?php
+        echo  '<div class="emoticons-chat">';
 		echo  "<a href=\"javascript:insert('".$emoticon_text1."')\">".$emoticon_img1."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text1."')\">".$emoticon_img1."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text2."')\">".$emoticon_img2."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text2."')\">".$emoticon_img2."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text3."')\">".$emoticon_img3."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text3."')\">".$emoticon_img3."</a>";
@@ -260,7 +265,7 @@ if (!empty($course) && !empty($_user['user_id'])) {
 		echo  "<a href=\"javascript:insert('".$emoticon_text7."')\">".$emoticon_img7."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text7."')\">".$emoticon_img7."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text8."')\">".$emoticon_img8."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text8."')\">".$emoticon_img8."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text9."')\">".$emoticon_img9."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text9."')\">".$emoticon_img9."</a>";
-		//echo  "<a href=\"javascript:insert('".$emoticon_text10."')\">".$emoticon_img10."</a>";
+		echo  "<a href=\"javascript:insert('".$emoticon_text10."')\">".$emoticon_img10."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text11."')\">".$emoticon_img11."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text11."')\">".$emoticon_img11."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text12."')\">".$emoticon_img12."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text12."')\">".$emoticon_img12."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text13."')\">".$emoticon_img13."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text13."')\">".$emoticon_img13."</a>";
@@ -271,19 +276,22 @@ if (!empty($course) && !empty($_user['user_id'])) {
 		echo  "<a href=\"javascript:insert('".$emoticon_text18."')\">".$emoticon_img18."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text18."')\">".$emoticon_img18."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text19."')\">".$emoticon_img19."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text19."')\">".$emoticon_img19."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text20."')\">".$emoticon_img20."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text20."')\">".$emoticon_img20."</a>";
+		echo  "<a href=\"javascript:insert('".$emoticon_text21."')\">".$emoticon_img21."</a>";
 		?>
 		?>
-        </td>
-        <td>
         <?php
         <?php
 		echo  "<a href=\"javascript:insert('".$emoticon_text201."')\">".$emoticon_img201."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text201."')\">".$emoticon_img201."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text202."')\">".$emoticon_img202."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text202."')\">".$emoticon_img202."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text203."')\">".$emoticon_img203."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text203."')\">".$emoticon_img203."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text204."')\">".$emoticon_img204."</a>";
 		echo  "<a href=\"javascript:insert('".$emoticon_text204."')\">".$emoticon_img204."</a>";
+		echo '</div>';
 		?>
 		?>
-        </td>
-    </tr>
-	</table>
+    </div>
     </form>
     </form>
+    <audio id="audio">
+	    <source type="audio/wav" src="sound/sonido_notificacion.wav"></source>
+	    <source type="audio/ogg" src="sound/sonido_notificacion.ogg"></source>
+	    <source type="audio/mpeg" src="sound/sonido_notificacion.mp3"></source>
+    </audio>
 <?php
 <?php
 }
 }
 require 'footer_frame.inc.php';
 require 'footer_frame.inc.php';

+ 3 - 2
main/chat/chat_whoisonline.php

@@ -107,9 +107,10 @@ if (!empty($course)) {
 	require 'header_frame.inc.php';
 	require 'header_frame.inc.php';
 
 
 	?>
 	?>
+	<div class="user-connected">
 	<div id="user-online-scroll" class="user-online">
 	<div id="user-online-scroll" class="user-online">
 
 
-		<div class="title"><?php echo get_lang('Connected'); ?></div>
+		<div class="title"><?php echo get_lang('Users'); ?> <?php echo get_lang('Connected'); ?></div>
 		<div class="scrollbar"><div class="track"><div class="thumb"><div class="end"></div></div></div></div>
 		<div class="scrollbar"><div class="track"><div class="thumb"><div class="end"></div></div></div></div>
 		<div class="viewport"><div id="hidden" class="overview">
 		<div class="viewport"><div id="hidden" class="overview">
 		<ul class="perfil list-group">
 		<ul class="perfil list-group">
@@ -136,7 +137,7 @@ if (!empty($course)) {
 			</li>
 			</li>
 			<?php  } unset($users); ?>
 			<?php  } unset($users); ?>
 		</ul>
 		</ul>
-	</div></div></div>
+	</div></div></div></div>
 	<?php
 	<?php
 }
 }
 require 'footer_frame.inc.php';
 require 'footer_frame.inc.php';

+ 20 - 14
main/chat/header_frame.inc.php

@@ -66,29 +66,35 @@ header('Content-Type: text/html; charset='.api_get_system_encoding());
              };
              };
          });
          });
         });
         });
-         $(document).ready(function(){
+        $(document).ready(function(){
                 $('#user-online-scroll').tinyscrollbar();
                 $('#user-online-scroll').tinyscrollbar();
             });
             });
+        //Sound send message
+        $(document).ready(function(){
+            $("#message").keypress(function(event){
+            if (event.which == 13) {
+                $("#audio")[0].play();
+                }
+            });
+        });
+        $(document).ready(function(){
+            $("#send").on("click",function(){
+                $("#audio")[0].play();
+            });
+        });
+
     </script>
     </script>
-    <style>
-        a {
-            font-size: 12px;
-        }
-        .background_submit {
-            background: url(../img/chat_little.gif) 2px 2px no-repeat;
-            padding: 2px 1px 1px 20px;
-        }
-        th {
-            font-size: 12px;
-        }
-    </style>
-<script>
+
+<script type="text/javascript">
 function updateChat()
 function updateChat()
 {
 {
 	if ('<?php echo $chat_size_old; ?>' != '<?php echo $chat_size_new; ?>') {
 	if ('<?php echo $chat_size_old; ?>' != '<?php echo $chat_size_new; ?>') {
 		parent.chat_chat.location.href='chat_chat.php?size=<?php echo $chat_size_new.'&'.api_get_cidreq(); ?>#bottom';
 		parent.chat_chat.location.href='chat_chat.php?size=<?php echo $chat_size_new.'&'.api_get_cidreq(); ?>#bottom';
 	}
 	}
 }
 }
+//$(window).load(function(updateChat){
+  //      $("#audio")[0].play();
+//});
 
 
 function updateConnected()
 function updateConnected()
 {
 {

BIN
main/chat/sound/sonido_notificacion.mp3


BIN
main/chat/sound/sonido_notificacion.ogg


BIN
main/chat/sound/sonido_notificacion.wav


+ 60 - 60
main/css/chat.css

@@ -3,13 +3,12 @@ body{
 	font-size: 13px;
 	font-size: 13px;
   	line-height: 18px;
   	line-height: 18px;
   	color: #333333;
   	color: #333333;
-  	background-color:#F5F5F5;
   	margin: 0;
   	margin: 0;
   	padding: 0;
   	padding: 0;
 }
 }
 .page-chat{
 .page-chat{
 	padding: 10px;
 	padding: 10px;
-	background: #F5F5F5;
+	background: #2C2C2C;
 }
 }
 #clear-chat{
 #clear-chat{
 		position: absolute;
 		position: absolute;
@@ -20,7 +19,7 @@ body{
         width:100px;
         width:100px;
 }
 }
 #content-chat{
 #content-chat{
-	background:#fff;
+	background:#3E3E3E;
 	padding: 30px;
 	padding: 30px;
 	-webkit-border-radius: 10px;
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -32,14 +31,14 @@ textarea {
 	height: 100px;
 	height: 100px;
 	float: left;
 	float: left;
 	border: 0;
 	border: 0;
-	background-color: #fff; 
+	background-color: #434343; 
 	font-size: 0.75em;
 	font-size: 0.75em;
 	font-family: Helvetica, arial, sans-serif;
 	font-family: Helvetica, arial, sans-serif;
 	-webkit-border-radius: 10px;
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
 	-moz-border-radius: 10px;
 	border-radius: 10px;
 	border-radius: 10px;
-	border: 1px solid #CCCCCC;
-	color: #555555;
+	border: 1px solid #434343;
+	color: #BDBDBA;
 	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.075) inset;
 	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.075) inset;
 }
 }
 .message-student .chat-image, .message-teacher .chat-image{
 .message-student .chat-image, .message-teacher .chat-image{
@@ -51,17 +50,18 @@ textarea {
  	-webkit-border-radius: 10px;
  	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
 	-moz-border-radius: 10px;
 	border-radius: 10px;
 	border-radius: 10px;
-	border:2px solid #D8D8D8;
+	border:2px solid #fff;
+	box-shadow: 1px 1px 10px #484848; 
  }
  }
 .message-student .content-message{
 .message-student .content-message{
-	background-color: #ffffff;
-    color: #555555;
+	background-color: #FAEDCE;
+    color: #000;
     padding: 10px;
     padding: 10px;
     margin-bottom: 15px;
     margin-bottom: 15px;
-    border-top: 1px solid #ECECEC;
-    border-left: 1px solid #ECECEC;
-    border-right: 1px solid #ECECEC;
-    border-bottom: 3px solid #ECECEC;
+    border-top: 1px solid #FAEDCE;
+    border-left: 1px solid #FAEDCE;
+    border-right: 1px solid #FAEDCE;
+    border-bottom: 1px solid #FAEDCE;
     border-radius: 10px;
     border-radius: 10px;
 
 
 	display: inline-block;
 	display: inline-block;
@@ -78,7 +78,7 @@ textarea {
 	height: 0; 
 	height: 0; 
 	border-top: 0px solid transparent;
 	border-top: 0px solid transparent;
 	border-bottom: 15px solid transparent;
 	border-bottom: 15px solid transparent;
-	border-left: 15px solid #DFF0D8;
+	border-left: 15px solid #F0E700;
 }
 }
 .message-student .icon-message{
 .message-student .icon-message{
 	display: inline-block;
 	display: inline-block;
@@ -88,17 +88,17 @@ textarea {
 	height: 0; 
 	height: 0; 
 	border-top: 0px solid transparent;
 	border-top: 0px solid transparent;
 	border-bottom: 15px solid transparent;
 	border-bottom: 15px solid transparent;
-	border-right: 15px solid white;
+	border-right: 15px solid #FAEDCE;
 }
 }
 .message-teacher .content-message{
 .message-teacher .content-message{
-	background-color: #DFF0D8;
-    color: #468847;
+	background-color: #EFE856;
+    color: #000;
     padding: 10px;
     padding: 10px;
     margin-bottom: 15px;
     margin-bottom: 15px;
-    border-top: 1px solid #D6E9C6;
-    border-left: 1px solid #D6E9C6;
-    border-right: 1px solid #D6E9C6;
-    border-bottom: 3px solid #D6E9C6;
+    border-top: 1px solid #EFE856;
+    border-left: 1px solid #EFE856;
+    border-right: 1px solid #EFE856;
+    border-bottom: 1px solid #EFE856;
     border-radius: 10px;
     border-radius: 10px;
 	display: inline-block;
 	display: inline-block;
 	font-size: 13px;
 	font-size: 13px;
@@ -130,24 +130,18 @@ textarea {
 	margin-bottom: 5px;
 	margin-bottom: 5px;
 }
 }
 .user-online .perfil li a{
 .user-online .perfil li a{
-	color: #666;
+	color: #fff;
 	text-decoration: none;
 	text-decoration: none;
 }
 }
 .user-online .title{
 .user-online .title{
-	color: #fff;
-	padding: 5px;
+	background: url(chat.png) no-repeat 0 center;
+	color: #ffffff;
+	padding-top: 5px;
+	padding-left: 30px;
 	font-weight: bold;
 	font-weight: bold;
 	font-size: 16px;
 	font-size: 16px;
 	margin-bottom: 15px;
 	margin-bottom: 15px;
 	width: 90%;
 	width: 90%;
-	background: #2a83bf; /* Old browsers */
-	background: -moz-linear-gradient(top, #2a83bf 0%, #216da8 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2a83bf), color-stop(100%,#216da8)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(top, #2a83bf 0%,#216da8 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top, #2a83bf 0%,#216da8 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top, #2a83bf 0%,#216da8 100%); /* IE10+ */
-	background: linear-gradient(to bottom, #2a83bf 0%,#216da8 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2a83bf', endColorstr='#216da8',GradientType=0 ); /* IE6-9 */
 }
 }
 .delete-chat{
 .delete-chat{
 	background: #F8F8F8;
 	background: #F8F8F8;
@@ -162,13 +156,20 @@ textarea {
   display: block;
   display: block;
   padding: 10px 15px;
   padding: 10px 15px;
   margin-bottom: -1px;
   margin-bottom: -1px;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
+  background-color: #3D3D3D;
+  border: 1px solid #3D3D3D;
+  -webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+	color: #666;
 }
 }
 li.list-group-item:hover, li.list-group-item:focus {
 li.list-group-item:hover, li.list-group-item:focus {
   text-decoration: none;
   text-decoration: none;
   background-color: #EEEEEE;
   background-color: #EEEEEE;
 }
 }
+li.list-group-item:hover a{
+	color: #000;
+}
 .user-image-chat{
 .user-image-chat{
 	width: 40px;
 	width: 40px;
  	height: auto;
  	height: auto;
@@ -192,27 +193,18 @@ li.list-group-item:hover, li.list-group-item:focus {
 .noSelect { user-select: none; -o-user-select: none; -moz-user-select: none; -khtml-user-select: none; -webkit-user-select: none; }
 .noSelect { user-select: none; -o-user-select: none; -moz-user-select: none; -khtml-user-select: none; -webkit-user-select: none; }
 
 
 .btn-enviar {
 .btn-enviar {
-	-moz-box-shadow:inset 0px 1px 0px 0px #c1ed9c;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #c1ed9c;
-	box-shadow:inset 0px 1px 0px 0px #c1ed9c;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) );
-	background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b');
-	background-color:#9dce2c;
-	-webkit-border-top-left-radius:10px;
-	-moz-border-radius-topleft:10px;
-	border-top-left-radius:10px;
-	-webkit-border-top-right-radius:10px;
-	-moz-border-radius-topright:10px;
-	border-top-right-radius:10px;
-	-webkit-border-bottom-right-radius:10px;
-	-moz-border-radius-bottomright:10px;
-	border-bottom-right-radius:10px;
-	-webkit-border-bottom-left-radius:10px;
-	-moz-border-radius-bottomleft:10px;
-	border-bottom-left-radius:10px;
-	text-indent:0;
-	border:1px solid #83c41a;
+	background: #fc585d; /* Old browsers */
+	background: -moz-linear-gradient(top, #fc585d 0%, #fd3746 99%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fc585d), color-stop(99%,#fd3746)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #fc585d 0%,#fd3746 99%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #fc585d 0%,#fd3746 99%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(top, #fc585d 0%,#fd3746 99%); /* IE10+ */
+	background: linear-gradient(to bottom, #fc585d 0%,#fd3746 99%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fc585d', endColorstr='#fd3746',GradientType=0 ); /* IE6-9 */
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+	border:1px solid #FD3746;
 	display:inline-block;
 	display:inline-block;
 	color:#ffffff;
 	color:#ffffff;
 	font-family:Arial;
 	font-family:Arial;
@@ -224,15 +216,23 @@ li.list-group-item:hover, li.list-group-item:focus {
 	width:131px;
 	width:131px;
 	text-decoration:none;
 	text-decoration:none;
 	text-align:center;
 	text-align:center;
-	text-shadow:1px 1px 0px #689324;
 	cursor: pointer;
 	cursor: pointer;
 }
 }
 .btn-enviar:hover {
 .btn-enviar:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) );
-	background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c');
-	background-color:#8cb82b;
+	opacity: 0.8;
 }.btn-enviar:active {
 }.btn-enviar:active {
 	position:relative;
 	position:relative;
 	top:1px;
 	top:1px;
+}
+.emoticons-chat img{
+  width: 24px;
+  border: none;
+}
+.message-form-chat{
+	margin-top: 20px;
+	padding: 10px;
+	-webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+	background: #3D3D3D;
 }
 }

BIN
main/img/emoticons/flag_green_small.png


BIN
main/img/emoticons/flag_red_small.png


BIN
main/img/emoticons/flag_yellow_small.png


BIN
main/img/emoticons/icon_angry.png


BIN
main/img/emoticons/icon_arrow.png


BIN
main/img/emoticons/icon_biggrin.png


BIN
main/img/emoticons/icon_confused.png


BIN
main/img/emoticons/icon_cool.png


BIN
main/img/emoticons/icon_eek.png


BIN
main/img/emoticons/icon_exclaim.png


BIN
main/img/emoticons/icon_hand.png


BIN
main/img/emoticons/icon_idea.png


BIN
main/img/emoticons/icon_mourn.png


BIN
main/img/emoticons/icon_neutral.png


BIN
main/img/emoticons/icon_question.png


BIN
main/img/emoticons/icon_razz.png


BIN
main/img/emoticons/icon_redface.png


BIN
main/img/emoticons/icon_sad.png


BIN
main/img/emoticons/icon_shhh.png


BIN
main/img/emoticons/icon_silenced.png


BIN
main/img/emoticons/icon_smile.png


BIN
main/img/emoticons/icon_surprised.png


BIN
main/img/emoticons/icon_think.png


BIN
main/img/emoticons/icon_wink.png


BIN
main/img/emoticons/waiting.png


+ 4 - 4
main/inc/ajax/model.ajax.php

@@ -316,7 +316,7 @@ switch ($action) {
         break;
         break;
     case 'get_sessions':
     case 'get_sessions':
         $courseId = isset($_GET['course_id']) && !empty($_GET['course_id']) ? intval($_GET['course_id']) : null;
         $courseId = isset($_GET['course_id']) && !empty($_GET['course_id']) ? intval($_GET['course_id']) : null;
-        $where_condition = str_replace('category_name', 'sc.name', $where_condition);
+        $whereCondition = str_replace('category_name', 'sc.name', $whereCondition);
         if (!empty($courseId)) {
         if (!empty($courseId)) {
             $whereCondition .= " AND c.id = $courseId";
             $whereCondition .= " AND c.id = $courseId";
         }
         }
@@ -625,7 +625,7 @@ switch ($action) {
         } else {
         } else {
             $columns = array('exe_date',  'score', 'actions');
             $columns = array('exe_date',  'score', 'actions');
         }
         }
-        $result = get_exam_results_hotpotatoes_data($start, $limit, $sidx, $sord, $hotpot_path, $whereCondition); //get_exam_results_data($start, $limit, $sidx, $sord, $exercise_id, $where_condition);
+        $result = get_exam_results_hotpotatoes_data($start, $limit, $sidx, $sord, $hotpot_path, $whereCondition);
         break;
         break;
     case 'get_work_student_list_overview':
     case 'get_work_student_list_overview':
         if (!api_is_allowed_to_edit()) {
         if (!api_is_allowed_to_edit()) {
@@ -728,8 +728,8 @@ switch ($action) {
             'name', 'nbr_courses', 'nbr_users', 'category_name', 'date_start','date_end', 'coach_name', 'session_active', 'visibility'
             'name', 'nbr_courses', 'nbr_users', 'category_name', 'date_start','date_end', 'coach_name', 'session_active', 'visibility'
         );
         );
 
 
-        //Rename Category_name
-        $where_condition = str_replace('category_name', 'sc.name', $where_condition);
+        // Rename Category_name
+        $whereCondition = str_replace('category_name', 'sc.name', $whereCondition);
 
 
         $result = SessionManager::get_sessions_admin(
         $result = SessionManager::get_sessions_admin(
             array(
             array(

+ 6 - 6
main/inc/lib/course_home.lib.php

@@ -143,7 +143,7 @@ class CourseHome
                 if (strpos($tool['name'], 'visio_') !== false) {
                 if (strpos($tool['name'], 'visio_') !== false) {
                     $cell_content .= '<a  href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'window_visio'.$_SESSION['_cid'].'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                     $cell_content .= '<a  href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'window_visio'.$_SESSION['_cid'].'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                 } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
                 } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
-                    $cell_content .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+540+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
+                    $cell_content .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                     // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
                     // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
                 } else {
                 } else {
                     $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                     $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
@@ -155,7 +155,7 @@ class CourseHome
                     if (strpos($tool['name'], 'visio_') !== false) {
                     if (strpos($tool['name'], 'visio_') !== false) {
                         $cell_content .= '<a  href="javascript: void(0);" onclick="window.open(\''.$tool['link'].$link_annex.'\',\'window_visio'.$_SESSION['_cid'].'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"><img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                         $cell_content .= '<a  href="javascript: void(0);" onclick="window.open(\''.$tool['link'].$link_annex.'\',\'window_visio'.$_SESSION['_cid'].'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"><img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                     } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
                     } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
-                        $cell_content .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+540+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'" class="invisible"><img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
+                        $cell_content .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'" class="invisible"><img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
                         // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
                         // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
                     } else {
                     } else {
                         $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'" class="invisible">
                         $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'" class="invisible">
@@ -318,7 +318,7 @@ class CourseHome
                 if (strpos($tool['name'], 'visio_') !== false) {
                 if (strpos($tool['name'], 'visio_') !== false) {
                     $html .= '<a  '.$class.' href="javascript: void(0);" onclick="javascript: window.open(\''.htmlspecialchars($tool['link']).(($tool['image'] == 'external.gif' || $tool['image'] == 'external_na.gif') ? '' : $qm_or_amp.api_get_cidreq()).'\',\'window_visio'.$_SESSION['_cid'].'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'">';
                     $html .= '<a  '.$class.' href="javascript: void(0);" onclick="javascript: window.open(\''.htmlspecialchars($tool['link']).(($tool['image'] == 'external.gif' || $tool['image'] == 'external_na.gif') ? '' : $qm_or_amp.api_get_cidreq()).'\',\'window_visio'.$_SESSION['_cid'].'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'">';
                 } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
                 } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
-                    $html .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.htmlspecialchars($tool['link']).$qm_or_amp.api_get_cidreq().'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+540+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"'.$class.'>';
+                    $html .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.htmlspecialchars($tool['link']).$qm_or_amp.api_get_cidreq().'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$tool['target'].'"'.$class.'>';
                 } else {
                 } else {
                     $html .= '<a href="'.htmlspecialchars($tool['link']).(($tool['image'] == 'external.gif' || $tool['image'] == 'external_na.gif') ? '' : $qm_or_amp.api_get_cidreq()).'" target="'.$tool['target'].'" '.$class.'>';
                     $html .= '<a href="'.htmlspecialchars($tool['link']).(($tool['image'] == 'external.gif' || $tool['image'] == 'external_na.gif') ? '' : $qm_or_amp.api_get_cidreq()).'" target="'.$tool['target'].'" '.$class.'>';
                 }
                 }
@@ -731,7 +731,7 @@ class CourseHome
                     $tool_link_params = array('id' => 'tooldesc_'.$tool["id"],
                     $tool_link_params = array('id' => 'tooldesc_'.$tool["id"],
                         'class' => $class,
                         'class' => $class,
                         'href' => 'javascript: void(0);',
                         'href' => 'javascript: void(0);',
-                        'onclick' => 'javascript: window.open(\''.$tool['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+540+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')', //Chat Open Windows
+                        'onclick' => 'javascript: window.open(\''.$tool['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')', //Chat Open Windows
                         'target' => $tool['target']);
                         'target' => $tool['target']);
                 } else {
                 } else {
                     if (count(explode('type=classroom', $tool['link'])) == 2 || count(explode('type=conference', $tool['link'])) == 2) {
                     if (count(explode('type=classroom', $tool['link'])) == 2 || count(explode('type=conference', $tool['link'])) == 2) {
@@ -1033,7 +1033,7 @@ class CourseHome
                 $url_current = parse_url($_SERVER['REQUEST_URI']);
                 $url_current = parse_url($_SERVER['REQUEST_URI']);
 
 
                 if (strpos($navigation_item['link'], 'chat') !== false && api_get_course_setting('allow_open_chat_window', $course_id)) {
                 if (strpos($navigation_item['link'], 'chat') !== false && api_get_course_setting('allow_open_chat_window', $course_id)) {
-                    $html .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$navigation_item['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+540+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$navigation_item['target'].'"';
+                    $html .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$navigation_item['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$navigation_item['target'].'"';
                 } else {
                 } else {
                     $html .= '<a href="'.$navigation_item['link'].'" target="_top" ';
                     $html .= '<a href="'.$navigation_item['link'].'" target="_top" ';
                 }
                 }
@@ -1075,7 +1075,7 @@ class CourseHome
 
 
             foreach ($navigation_items as $key => $navigation_item) {
             foreach ($navigation_items as $key => $navigation_item) {
                 if (strpos($navigation_item['link'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
                 if (strpos($navigation_item['link'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
-                    $html .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$navigation_item['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+540+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$navigation_item['target'].'"';
+                    $html .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$navigation_item['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$navigation_item['target'].'"';
                 } else {
                 } else {
                     $html .= '<a href="'.$navigation_item['link'].'"';
                     $html .= '<a href="'.$navigation_item['link'].'"';
                 }
                 }

+ 40 - 27
main/inc/lib/formvalidator/Element/DatePicker.php

@@ -1,36 +1,47 @@
 <?php
 <?php
 /* For licensing terms, see /license.txt */
 /* For licensing terms, see /license.txt */
+
 require_once 'HTML/QuickForm/date.php';
 require_once 'HTML/QuickForm/date.php';
 
 
 /**
 /**
  * Form element to select a date and hour (with popup datepicker)
  * Form element to select a date and hour (with popup datepicker)
+ *
+ * Class DatePicker
  */
  */
 class DatePicker extends HTML_QuickForm_text
 class DatePicker extends HTML_QuickForm_text
 {
 {
-	/**
-	 * Constructor
-	 */
-	public function DatePicker($elementName = null, $elementLabel = null, $attributes = null)
-	{
+    /**
+     * @param string $elementName
+     * @param string $elementLabel
+     * @param array  $attributes
+     */
+    public function DatePicker($elementName = null, $elementLabel = null, $attributes = null)
+    {
         if (!isset($attributes['id'])) {
         if (!isset($attributes['id'])) {
             $attributes['id'] = $elementName;
             $attributes['id'] = $elementName;
         }
         }
 
 
-		HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-		$this->_appendName = true;
-		$this->_type = 'date_picker';
-	}
-
-	/**
-	 * HTML code to display this datepicker
-	 */
-	public function toHtml()
-	{
-		$js = $this->getElementJS();
-		return $js.parent::toHtml();
-	}
-
-    function setValue($value)
+        HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
+        $this->_appendName = true;
+        $this->_type = 'date_picker';
+    }
+
+    /**
+    * HTML code to display this datepicker
+     *
+     * @return string
+    */
+    public function toHtml()
+    {
+        $js = $this->getElementJS();
+
+        return $js.parent::toHtml();
+    }
+
+    /**
+     * @param string $value
+     */
+    public function setValue($value)
     {
     {
         $value = substr($value, 0, 16);
         $value = substr($value, 0, 16);
         $this->updateAttributes(
         $this->updateAttributes(
@@ -40,11 +51,12 @@ class DatePicker extends HTML_QuickForm_text
         );
         );
     }
     }
 
 
-	/**
-	 * Get the necessary javascript for this datepicker
-	 */
-	private function getElementJS()
-	{
+    /**
+     * Get the necessary javascript for this datepicker
+     * @return string
+     */
+    private function getElementJS()
+    {
         $js = null;
         $js = null;
         $id = $this->getAttribute('id');
         $id = $this->getAttribute('id');
 
 
@@ -56,6 +68,7 @@ class DatePicker extends HTML_QuickForm_text
             });
             });
         </script>";
         </script>";
 
 
-		return $js;
-	}
+        return $js;
+    }
+
 }
 }

+ 0 - 0
main/inc/lib/formvalidator/Element/datepicker.php → main/inc/lib/formvalidator/Element/datepicker_old.php


+ 12 - 11
main/inc/lib/formvalidator/FormValidator.class.php

@@ -124,13 +124,12 @@ class FormValidator extends HTML_QuickForm
 
 
         // Load some custom elements and rules
         // Load some custom elements and rules
         $dir = api_get_path(LIBRARY_PATH) . 'formvalidator/';
         $dir = api_get_path(LIBRARY_PATH) . 'formvalidator/';
-        $this->registerElementType('html_editor', $dir . 'Element/html_editor.php', 'HTML_QuickForm_html_editor');
 
 
+        $this->registerElementType('html_editor', $dir . 'Element/html_editor.php', 'HTML_QuickForm_html_editor');
         $this->registerElementType('date_range_picker', $dir . 'Element/DateRangePicker.php', 'DateRangePicker');
         $this->registerElementType('date_range_picker', $dir . 'Element/DateRangePicker.php', 'DateRangePicker');
         $this->registerElementType('date_time_picker', $dir . 'Element/DateTimePicker.php', 'DateTimePicker');
         $this->registerElementType('date_time_picker', $dir . 'Element/DateTimePicker.php', 'DateTimePicker');
         $this->registerElementType('date_picker', $dir . 'Element/DatePicker.php', 'DatePicker');
         $this->registerElementType('date_picker', $dir . 'Element/DatePicker.php', 'DatePicker');
-
-        $this->registerElementType('datepicker', $dir . 'Element/datepicker.php', 'HTML_QuickForm_datepicker');
+        $this->registerElementType('datepicker', $dir . 'Element/datepicker_old.php', 'HTML_QuickForm_datepicker');
         $this->registerElementType('datepickerdate', $dir . 'Element/datepickerdate.php', 'HTML_QuickForm_datepickerdate');
         $this->registerElementType('datepickerdate', $dir . 'Element/datepickerdate.php', 'HTML_QuickForm_datepickerdate');
         $this->registerElementType('receivers', $dir . 'Element/receivers.php', 'HTML_QuickForm_receivers');
         $this->registerElementType('receivers', $dir . 'Element/receivers.php', 'HTML_QuickForm_receivers');
         $this->registerElementType('select_language', $dir . 'Element/select_language.php', 'HTML_QuickForm_Select_Language');
         $this->registerElementType('select_language', $dir . 'Element/select_language.php', 'HTML_QuickForm_Select_Language');
@@ -540,7 +539,7 @@ EOT;
      * If an element in the form didn't validate, an error message is showed
      * If an element in the form didn't validate, an error message is showed
      * asking the user to complete the form.
      * asking the user to complete the form.
      */
      */
-    function display()
+    public function display()
     {
     {
         echo $this->return_form();
         echo $this->return_form();
     }
     }
@@ -572,20 +571,22 @@ EOT;
         $return_value = '';
         $return_value = '';
         $js = null;
         $js = null;
         if ($addDateLibraries) {
         if ($addDateLibraries) {
-            $js = api_get_js('jquery-ui/jquery-ui-i18n.min.js');
+
+            $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/daterange/moment.min.js" type="text/javascript"></script>';
             $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/jquery-ui-timepicker-addon.js" type="text/javascript"></script>';
             $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/jquery-ui-timepicker-addon.js" type="text/javascript"></script>';
             $js .= '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/jquery-ui-timepicker-addon.css" rel="stylesheet" type="text/css" />';
             $js .= '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/jquery-ui-timepicker-addon.css" rel="stylesheet" type="text/css" />';
-            $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/daterange/moment.min.js" type="text/javascript"></script>';
             $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/daterange/daterangepicker.js" type="text/javascript"></script>';
             $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/daterange/daterangepicker.js" type="text/javascript"></script>';
             $js .= '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/daterange/daterangepicker-bs2.css" rel="stylesheet" type="text/css" />';
             $js .= '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/daterange/daterangepicker-bs2.css" rel="stylesheet" type="text/css" />';
 
 
-            $isocode = api_get_language_isocode();
-            if ($isocode != 'en') {
-                $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/i18n/jquery-ui-timepicker-'.$isocode.'.js" type="text/javascript"></script>';
+            $isoCode = api_get_language_isocode();
+
+            if ($isoCode != 'en') {
+                $js .= api_get_js('jquery-ui/jquery-ui-i18n.min.js');
+                $js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/datetimepicker/i18n/jquery-ui-timepicker-'.$isoCode.'.js" type="text/javascript"></script>';
                 $js .= '<script>
                 $js .= '<script>
                 $(function(){
                 $(function(){
-                    $.datepicker.setDefaults($.datepicker.regional["'.$isocode.'"]);
-                     moment.lang("'.$isocode.'");
+                    moment.lang("'.$isoCode.'");
+                    $.datepicker.setDefaults($.datepicker.regional["'.$isoCode.'"]);
                 });
                 });
                 </script>';
                 </script>';
             }
             }

+ 12 - 10
main/inc/local.inc.php

@@ -659,12 +659,13 @@ if (!empty($cidReq) && (!isset($_SESSION['_cid']) or (isset($_SESSION['_cid']) &
 
 
 /* USER INIT */
 /* USER INIT */
 
 
-if (isset($uidReset) && $uidReset) {    // session data refresh requested
+if (isset($uidReset) && $uidReset) {
+    // session data refresh requested
     unset($_SESSION['_user']['uidReset']);
     unset($_SESSION['_user']['uidReset']);
     $is_platformAdmin = false;
     $is_platformAdmin = false;
     $is_allowedCreateCourse = false;
     $is_allowedCreateCourse = false;
 
 
-    if (isset($_user['user_id']) && $_user['user_id'] && ! api_is_anonymous()) {
+    if (isset($_user['user_id']) && $_user['user_id']) {
         // a uid is given (log in succeeded)
         // a uid is given (log in succeeded)
 
 
         $_SESSION['loginFailed'] = false;
         $_SESSION['loginFailed'] = false;
@@ -692,10 +693,10 @@ if (isset($uidReset) && $uidReset) {    // session data refresh requested
             $uData = Database::fetch_array($result);
             $uData = Database::fetch_array($result);
 
 
             $_user =  _api_format_user($uData, false);
             $_user =  _api_format_user($uData, false);
-            $_user['lastLogin']        = api_strtotime($uData['login_date'], 'UTC');
+            $_user['lastLogin'] = api_strtotime($uData['login_date'], 'UTC');
 
 
-            $is_platformAdmin           = (bool) (! is_null( $uData['is_admin']));
-            $is_allowedCreateCourse     = (bool) (($uData ['status'] == COURSEMANAGER) or (api_get_setting('drhCourseManagerRights') and $uData['status'] == DRH));
+            $is_platformAdmin = (bool) (! is_null( $uData['is_admin']));
+            $is_allowedCreateCourse = (bool) (($uData ['status'] == COURSEMANAGER) or (api_get_setting('drhCourseManagerRights') and $uData['status'] == DRH));
             ConditionalLogin::check_conditions($uData);
             ConditionalLogin::check_conditions($uData);
 
 
             Session::write('_user',$_user);
             Session::write('_user',$_user);
@@ -706,7 +707,8 @@ if (isset($uidReset) && $uidReset) {    // session data refresh requested
             header('location:'.api_get_path(WEB_PATH));
             header('location:'.api_get_path(WEB_PATH));
             //exit("WARNING UNDEFINED UID !! ");
             //exit("WARNING UNDEFINED UID !! ");
         }
         }
-    } else { // no uid => logout or Anonymous
+    } else {
+        // no uid => logout or Anonymous
         Session::erase('_user');
         Session::erase('_user');
         Session::erase('_uid');
         Session::erase('_uid');
     }
     }
@@ -1136,14 +1138,14 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset))
     }
     }
 
 
     if (!$is_platformAdmin) {
     if (!$is_platformAdmin) {
-        if (!$is_courseMember && 
-            isset($_course['registration_code']) && 
-            !empty($_course['registration_code']) && 
+        if (!$is_courseMember &&
+            isset($_course['registration_code']) &&
+            !empty($_course['registration_code']) &&
             !Session::read('course_password_'.$_course['real_id'], false)
             !Session::read('course_password_'.$_course['real_id'], false)
         ) {
         ) {
             // if we are here we try to access to a course requiring password
             // if we are here we try to access to a course requiring password
             if ($is_allowed_in_course) {
             if ($is_allowed_in_course) {
-                // the course visibility allows to access the course 
+                // the course visibility allows to access the course
                 // with a password
                 // with a password
                 $url = api_get_path(WEB_CODE_PATH).'auth/set_temp_password.php?course_id='.$_course['real_id'].'&session_id='.$session_id;
                 $url = api_get_path(WEB_CODE_PATH).'auth/set_temp_password.php?course_id='.$_course['real_id'].'&session_id='.$session_id;
                 header('Location: '.$url);
                 header('Location: '.$url);

+ 0 - 1
main/lang/arabic/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "الشهر";
 $langPeriodYear = "السنة";
 $langPeriodYear = "السنة";
 $langNextDay = "اليوم التالي";
 $langNextDay = "اليوم التالي";
 $langPreviousDay = "اليوم السابق";
 $langPreviousDay = "اليوم السابق";
-$langNextWeek = "الأسبوع التالي";
 $langPreviousWeek = "الأسبوع الماضي";
 $langPreviousWeek = "الأسبوع الماضي";
 $langNextMonth = "الشهر التالي";
 $langNextMonth = "الشهر التالي";
 $langPreviousMonth = "الشهر الماضي";
 $langPreviousMonth = "الشهر الماضي";

+ 1 - 0
main/lang/arabic/trad4all.inc.php

@@ -488,6 +488,7 @@ $Phone = "الهاتف";
 $SocialNetwork = "شبكة التواصل";
 $SocialNetwork = "شبكة التواصل";
 $Photo = "الصورة";
 $Photo = "الصورة";
 $HistoryTrainingSessions = "سجل مواهيد المقررات";
 $HistoryTrainingSessions = "سجل مواهيد المقررات";
+$NextWeek = "الأسبوع التالي";
 $GeneralDescription = "نبذة عامة";
 $GeneralDescription = "نبذة عامة";
 $GeneralDescriptionQuestions = "ما هي أهمية هذا المقرر؟  هل هناك متطلبات مسبقة ؟ كيف هو حال هذا المقرر  مع المقررات الأخرى؟";
 $GeneralDescriptionQuestions = "ما هي أهمية هذا المقرر؟  هل هناك متطلبات مسبقة ؟ كيف هو حال هذا المقرر  مع المقررات الأخرى؟";
 $GeneralDescriptionInformation = "وصف مختصر (عدد الساعات الرسمية المدونه الغرفة...) والمعلمين (الاسم واسم مكتب الهاتف البريد الالكتروني...";
 $GeneralDescriptionInformation = "وصف مختصر (عدد الساعات الرسمية المدونه الغرفة...) والمعلمين (الاسم واسم مكتب الهاتف البريد الالكتروني...";

+ 0 - 1
main/lang/asturian/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Mes";
 $langPeriodYear = "Añu";
 $langPeriodYear = "Añu";
 $langNextDay = "Siguiente día";
 $langNextDay = "Siguiente día";
 $langPreviousDay = "Día anterior";
 $langPreviousDay = "Día anterior";
-$langNextWeek = "Siguiente selmana";
 $langPreviousWeek = "Selmana anterior";
 $langPreviousWeek = "Selmana anterior";
 $langNextMonth = "Siguiente mes";
 $langNextMonth = "Siguiente mes";
 $langPreviousMonth = "Mes anterior";
 $langPreviousMonth = "Mes anterior";

+ 1 - 0
main/lang/asturian/trad4all.inc.php

@@ -727,6 +727,7 @@ $Until = "Fasta";
 $FirstPage = "Primer páxina";
 $FirstPage = "Primer páxina";
 $LastPage = "Páxina cabera";
 $LastPage = "Páxina cabera";
 $Coachs = "Tutores";
 $Coachs = "Tutores";
+$NextWeek = "Siguiente selmana";
 $GeneralDescription = "Descripción xeneral";
 $GeneralDescription = "Descripción xeneral";
 $GeneralDescriptionQuestions = "¿ Qué papel y función tien esti cursu nel programa ? ¿ Necesítense actividaes previes ? ¿Qué rellación tien con otros cursos ?";
 $GeneralDescriptionQuestions = "¿ Qué papel y función tien esti cursu nel programa ? ¿ Necesítense actividaes previes ? ¿Qué rellación tien con otros cursos ?";
 $GeneralDescriptionInformation = "Descripción del crusu (númberu d'hores, códigu, llugar onde se da...), Profesor (nome, apellíos, despachu, teléfonu, e-mail...).";
 $GeneralDescriptionInformation = "Descripción del crusu (númberu d'hores, códigu, llugar onde se da...), Profesor (nome, apellíos, despachu, teléfonu, e-mail...).";

+ 0 - 1
main/lang/basque/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Hila";
 $langPeriodYear = "Urtea";
 $langPeriodYear = "Urtea";
 $langNextDay = "Biharamuna";
 $langNextDay = "Biharamuna";
 $langPreviousDay = "Aurreko eguna";
 $langPreviousDay = "Aurreko eguna";
-$langNextWeek = "Hurrengo astea";
 $langPreviousWeek = "Aurreko astea";
 $langPreviousWeek = "Aurreko astea";
 $langNextMonth = "Hurrengo hila";
 $langNextMonth = "Hurrengo hila";
 $langPreviousMonth = "Aurreko hila";
 $langPreviousMonth = "Aurreko hila";

+ 1 - 0
main/lang/basque/trad4all.inc.php

@@ -744,6 +744,7 @@ $Until = "Noiz arte";
 $FirstPage = "Lehen orria";
 $FirstPage = "Lehen orria";
 $LastPage = "Azken orria";
 $LastPage = "Azken orria";
 $Coachs = "Arduradunak";
 $Coachs = "Arduradunak";
+$NextWeek = "Hurrengo astea";
 $DragAndDropAnElementHere = "Arrastatu eta jaregin elementu bat hemen";
 $DragAndDropAnElementHere = "Arrastatu eta jaregin elementu bat hemen";
 $ThereAreNoRegisteredDatetimeYet = "Oraindik ez dago data/ordurik erregistratuta";
 $ThereAreNoRegisteredDatetimeYet = "Oraindik ez dago data/ordurik erregistratuta";
 $CalendarList = "Parte hartzeen zerrenda-egutegia";
 $CalendarList = "Parte hartzeen zerrenda-egutegia";

+ 0 - 1
main/lang/brazilian/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Mês";
 $langPeriodYear = "Ano";
 $langPeriodYear = "Ano";
 $langNextDay = "Próximo Dia";
 $langNextDay = "Próximo Dia";
 $langPreviousDay = "Dia Anterior";
 $langPreviousDay = "Dia Anterior";
-$langNextWeek = "Próxima Semana";
 $langPreviousWeek = "Semana Anterior";
 $langPreviousWeek = "Semana Anterior";
 $langNextMonth = "Próximo Mês";
 $langNextMonth = "Próximo Mês";
 $langPreviousMonth = "Mês Anterior";
 $langPreviousMonth = "Mês Anterior";

+ 1 - 0
main/lang/brazilian/trad4all.inc.php

@@ -732,6 +732,7 @@ $Until = "até";
 $FirstPage = "Primeira página";
 $FirstPage = "Primeira página";
 $LastPage = "Última página";
 $LastPage = "Última página";
 $Coachs = "Professores";
 $Coachs = "Professores";
+$NextWeek = "Próxima Semana";
 $DragAndDropAnElementHere = "Arraste e solte aqui um elemento";
 $DragAndDropAnElementHere = "Arraste e solte aqui um elemento";
 $ThereAreNoRegisteredDatetimeYet = "Não há uma data/hora registrada ainda";
 $ThereAreNoRegisteredDatetimeYet = "Não há uma data/hora registrada ainda";
 $CalendarList = "Lista do calendário de presença";
 $CalendarList = "Lista do calendário de presença";

+ 0 - 1
main/lang/bulgarian/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Месец";
 $langPeriodYear = "Година";
 $langPeriodYear = "Година";
 $langNextDay = "Следващият ден";
 $langNextDay = "Следващият ден";
 $langPreviousDay = "Предишният ден";
 $langPreviousDay = "Предишният ден";
-$langNextWeek = "Следващата седмица";
 $langPreviousWeek = "Предишната седмица";
 $langPreviousWeek = "Предишната седмица";
 $langNextMonth = "Следващият месец";
 $langNextMonth = "Следващият месец";
 $langPreviousMonth = "Предишният месец";
 $langPreviousMonth = "Предишният месец";

+ 1 - 0
main/lang/bulgarian/trad4all.inc.php

@@ -721,6 +721,7 @@ $HistoryTrainingSession = "История на обучителната сеси
 $FirstPage = "Първа страница";
 $FirstPage = "Първа страница";
 $LastPage = "Последна страница";
 $LastPage = "Последна страница";
 $Coachs = "Инструктори";
 $Coachs = "Инструктори";
+$NextWeek = "Следващата седмица";
 $CalendarList = "Календарен списък на присъствията";
 $CalendarList = "Календарен списък на присъствията";
 $AddDateAndTime = "Добавяне на дата и час";
 $AddDateAndTime = "Добавяне на дата и час";
 $AttendanceSheet = "Присъствия";
 $AttendanceSheet = "Присъствия";

+ 1 - 0
main/lang/catalan/admin.inc.php

@@ -2,6 +2,7 @@
 /*
 /*
 for more information: see languages.txt in the lang folder.
 for more information: see languages.txt in the lang folder.
 */
 */
+$ClassIdDoesntExists = "La classe ID no existeix";
 $SearchSessions = "Recerca de sessions";
 $SearchSessions = "Recerca de sessions";
 $DeleteUsersNotInList = "Dóna de baixa als alumnes que no estiguin a la llista importada";
 $DeleteUsersNotInList = "Dóna de baixa als alumnes que no estiguin a la llista importada";
 $IfSessionExistsUpdate = "Si la sessió existeix, actualitza-la";
 $IfSessionExistsUpdate = "Si la sessió existeix, actualitza-la";

+ 0 - 1
main/lang/catalan/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Mes";
 $langPeriodYear = "Any";
 $langPeriodYear = "Any";
 $langNextDay = "Pròxim dia";
 $langNextDay = "Pròxim dia";
 $langPreviousDay = "Dia anterior";
 $langPreviousDay = "Dia anterior";
-$langNextWeek = "Pròxima setmana";
 $langPreviousWeek = "Setmana anterior";
 $langPreviousWeek = "Setmana anterior";
 $langNextMonth = "Pròxim mes";
 $langNextMonth = "Pròxim mes";
 $langPreviousMonth = "Mes anterior";
 $langPreviousMonth = "Mes anterior";

+ 1 - 0
main/lang/catalan/trad4all.inc.php

@@ -816,6 +816,7 @@ $Until = "Fins";
 $FirstPage = "Primera pàgina";
 $FirstPage = "Primera pàgina";
 $LastPage = "Última pàgina";
 $LastPage = "Última pàgina";
 $Coachs = "Tutors";
 $Coachs = "Tutors";
+$NextWeek = "Pròxima setmana";
 $DragAndDropAnElementHere = "Arrossegueu i deixeu anar un element aquí";
 $DragAndDropAnElementHere = "Arrossegueu i deixeu anar un element aquí";
 $ThereAreNoRegisteredDatetimeYet = "Encara no hi ha registrada cap data/hora";
 $ThereAreNoRegisteredDatetimeYet = "Encara no hi ha registrada cap data/hora";
 $CalendarList = "Dates de la llista d'assistència";
 $CalendarList = "Dates de la llista d'assistència";

+ 1 - 0
main/lang/catalan/work.inc.php

@@ -2,6 +2,7 @@
 /*
 /*
 for more information: see languages.txt in the lang folder.
 for more information: see languages.txt in the lang folder.
 */
 */
+$WorkFileNotUploadedDirXDoesNotExist = "La tasca no s'ha pogut enviar perquè la carpeta %s no existeix";
 $FolderDoesntExistsInFileSystem = "La carpeta de destinació no existeix al servidor";
 $FolderDoesntExistsInFileSystem = "La carpeta de destinació no existeix al servidor";
 $HandedOutDate = "Data de recepció";
 $HandedOutDate = "Data de recepció";
 $HandedOut = "Entregat";
 $HandedOut = "Entregat";

+ 0 - 1
main/lang/croatian/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Mjesec";
 $langPeriodYear = "Godina";
 $langPeriodYear = "Godina";
 $langNextDay = "Sljedeći dan";
 $langNextDay = "Sljedeći dan";
 $langPreviousDay = "Prethodni dan";
 $langPreviousDay = "Prethodni dan";
-$langNextWeek = "Sljedeći tjedan";
 $langPreviousWeek = "Prethodni tjedan";
 $langPreviousWeek = "Prethodni tjedan";
 $langNextMonth = "Sljedeći mjesec";
 $langNextMonth = "Sljedeći mjesec";
 $langPreviousMonth = "Prethodni mjesec";
 $langPreviousMonth = "Prethodni mjesec";

+ 1 - 0
main/lang/croatian/trad4all.inc.php

@@ -574,6 +574,7 @@ $BackToPreviousPage = "Povratak na prethodnu stranicu";
 $ListView = "Prikaži kao listu";
 $ListView = "Prikaži kao listu";
 $NoOfficialCode = "Nema službene šifre";
 $NoOfficialCode = "Nema službene šifre";
 $Owner = "Vlasnik";
 $Owner = "Vlasnik";
+$NextWeek = "Sljedeći tjedan";
 $GeneralDescription = "Opći opis";
 $GeneralDescription = "Opći opis";
 $GeneralDescriptionQuestions = "Koje mjesto kolegij ima u programu? Postoje li kakvi preduvjeti? Kako je kolegij povezan s drugim kolegijima?";
 $GeneralDescriptionQuestions = "Koje mjesto kolegij ima u programu? Postoje li kakvi preduvjeti? Kako je kolegij povezan s drugim kolegijima?";
 $GeneralDescriptionInformation = "Opišite kolegij (broj sati, službena šifra, prostorija...) i predavača (prezime, ime, ured, broj telefona, elektronička pošta...).";
 $GeneralDescriptionInformation = "Opišite kolegij (broj sati, službena šifra, prostorija...) i predavača (prezime, ime, ured, broj telefona, elektronička pošta...).";

+ 0 - 1
main/lang/danish/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Måned";
 $langPeriodYear = "År";
 $langPeriodYear = "År";
 $langNextDay = "Næste dag";
 $langNextDay = "Næste dag";
 $langPreviousDay = "Forrige dag";
 $langPreviousDay = "Forrige dag";
-$langNextWeek = "Næste uge";
 $langPreviousWeek = "Forrige uge";
 $langPreviousWeek = "Forrige uge";
 $langNextMonth = "Næste måned";
 $langNextMonth = "Næste måned";
 $langPreviousMonth = "Tidligere måneder";
 $langPreviousMonth = "Tidligere måneder";

+ 1 - 0
main/lang/danish/trad4all.inc.php

@@ -473,6 +473,7 @@ $Gradebook = "Karakterer";
 $OpenIDWhatIs = "Hvad er OpenID?";
 $OpenIDWhatIs = "Hvad er OpenID?";
 $OpenIDDescription = "OpenID eliminates the need for multiple usernames across different websites, simplifying your online experience. You get to choose the OpenID Provider that best meets your needs and most importantly that you trust. At the same time, your OpenID can stay with you, no matter which Provider you move to. And best of all, the OpenID technology is not proprietary and is completely free. For businesses, this means a lower cost of password and account management, while drawing new web traffic. OpenID lowers user frustration by letting users have control of their login.Read on...";
 $OpenIDDescription = "OpenID eliminates the need for multiple usernames across different websites, simplifying your online experience. You get to choose the OpenID Provider that best meets your needs and most importantly that you trust. At the same time, your OpenID can stay with you, no matter which Provider you move to. And best of all, the OpenID technology is not proprietary and is completely free. For businesses, this means a lower cost of password and account management, while drawing new web traffic. OpenID lowers user frustration by letting users have control of their login.Read on...";
 $NoManager = "Ingen administrator";
 $NoManager = "Ingen administrator";
+$NextWeek = "Næste uge";
 $GeneralDescription = "Generel beskrivelse";
 $GeneralDescription = "Generel beskrivelse";
 $GeneralDescriptionQuestions = "Hvilken placering har kurset i uddannelsesforløbet? Hvilke krav er der til kurset? Hvordan er kurset forbundet med andre kurser?";
 $GeneralDescriptionQuestions = "Hvilken placering har kurset i uddannelsesforløbet? Hvilke krav er der til kurset? Hvordan er kurset forbundet med andre kurser?";
 $GeneralDescriptionInformation = "Beskriv kurset (antal timer, lokale mv.) og underviser (navn, fornavn, kontor, telefonnummer, e-mail...)";
 $GeneralDescriptionInformation = "Beskriv kurset (antal timer, lokale mv.) og underviser (navn, fornavn, kontor, telefonnummer, e-mail...)";

+ 0 - 1
main/lang/dutch/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Maand";
 $langPeriodYear = "Jaar";
 $langPeriodYear = "Jaar";
 $langNextDay = "Volgende dag";
 $langNextDay = "Volgende dag";
 $langPreviousDay = "Vorige dag";
 $langPreviousDay = "Vorige dag";
-$langNextWeek = "Volgende week";
 $langPreviousWeek = "Vorige week";
 $langPreviousWeek = "Vorige week";
 $langNextMonth = "Volgende maand";
 $langNextMonth = "Volgende maand";
 $langPreviousMonth = "Vorige maand";
 $langPreviousMonth = "Vorige maand";

+ 1 - 0
main/lang/dutch/trad4all.inc.php

@@ -735,6 +735,7 @@ $Until = "Tot";
 $FirstPage = "Eerste pagina";
 $FirstPage = "Eerste pagina";
 $LastPage = "Laatste pagina";
 $LastPage = "Laatste pagina";
 $Coachs = "Coach";
 $Coachs = "Coach";
+$NextWeek = "Volgende week";
 $DragAndDropAnElementHere = "Sleep hier een element naartoe";
 $DragAndDropAnElementHere = "Sleep hier een element naartoe";
 $ThereAreNoRegisteredDatetimeYet = "Er is nog geen datum/tijd geregistreerd";
 $ThereAreNoRegisteredDatetimeYet = "Er is nog geen datum/tijd geregistreerd";
 $CalendarList = "Kalender lijst aanwezigheden";
 $CalendarList = "Kalender lijst aanwezigheden";

+ 0 - 1
main/lang/english/admin.inc.php

@@ -48,7 +48,6 @@ $ConfigureHomePage = "Edit portal homepage";
 $CourseCreateActiveToolsTitle = "Modules active upon course creation";
 $CourseCreateActiveToolsTitle = "Modules active upon course creation";
 $CourseCreateActiveToolsComment = "Which tools have to be enabled (visible) by default when a new course is created?";
 $CourseCreateActiveToolsComment = "Which tools have to be enabled (visible) by default when a new course is created?";
 $SearchUsers = "Search users";
 $SearchUsers = "Search users";
-$SearchUser = "Search users";
 $CreateUser = "Create user";
 $CreateUser = "Create user";
 $ModifyInformation = "Edit information";
 $ModifyInformation = "Edit information";
 $ModifyUser = "Edit user";
 $ModifyUser = "Edit user";

+ 1 - 1
main/lang/english/courses.inc.php

@@ -67,7 +67,7 @@ $ExistingCourseCategories = "Existing courses categories";
 $YouAreNowUnsubscribed = "You are now unsubscribed from the training";
 $YouAreNowUnsubscribed = "You are now unsubscribed from the training";
 $ViewOpenCourses = "View public courses";
 $ViewOpenCourses = "View public courses";
 $ErrorContactPlatformAdmin = "There happened an unknown error. Please contact the platform administrator.";
 $ErrorContactPlatformAdmin = "There happened an unknown error. Please contact the platform administrator.";
-$CourseRegistrationCodeIncorrect = "The course code is incorrect";
+$CourseRegistrationCodeIncorrect = "The course password is incorrect";
 $CourseRequiresPassword = "This course requires a password";
 $CourseRequiresPassword = "This course requires a password";
 $SubmitRegistrationCode = "Submit registration code";
 $SubmitRegistrationCode = "Submit registration code";
 $CourseCategoryDeleted = "The category was deleted";
 $CourseCategoryDeleted = "The category was deleted";

+ 1 - 1
main/lang/english/exercice.inc.php

@@ -585,4 +585,4 @@ $NoNegativeScore = "No negative score";
 $GlobalMultipleAnswer = "Global multiple answer";
 $GlobalMultipleAnswer = "Global multiple answer";
 $AllQuestionsShort = "All";
 $AllQuestionsShort = "All";
 $ProblemsRecordingUploadYourOwnAudioFile = "Problem recording? Upload your own audio file.";
 $ProblemsRecordingUploadYourOwnAudioFile = "Problem recording? Upload your own audio file.";
-?>
+?>

+ 1 - 0
main/lang/english/survey.inc.php

@@ -2,6 +2,7 @@
 /*
 /*
 for more information: see languages.txt in the lang folder.
 for more information: see languages.txt in the lang folder.
 */
 */
+$StartSurvey = "Start the Survey";
 $PublishSurvey = "Publish survey";
 $PublishSurvey = "Publish survey";
 $CompareQuestions = "Compare questions";
 $CompareQuestions = "Compare questions";
 $InformationUpdated = "Information updated";
 $InformationUpdated = "Information updated";

+ 0 - 1
main/lang/english/tracking.inc.php

@@ -136,7 +136,6 @@ $langPeriodMonth = "Month";
 $langPeriodYear = "Year";
 $langPeriodYear = "Year";
 $langNextDay = "Next Day";
 $langNextDay = "Next Day";
 $langPreviousDay = "Previous Day";
 $langPreviousDay = "Previous Day";
-$langNextWeek = "Next Week";
 $langPreviousWeek = "Previous Week";
 $langPreviousWeek = "Previous Week";
 $langNextMonth = "Next Month";
 $langNextMonth = "Next Month";
 $langPreviousMonth = "Previous Month";
 $langPreviousMonth = "Previous Month";

+ 0 - 1
main/lang/esperanto/tracking.inc.php

@@ -76,7 +76,6 @@ $langPeriodMonth = "Monato";
 $langPeriodYear = "Jaro";
 $langPeriodYear = "Jaro";
 $langNextDay = "Venonta tago";
 $langNextDay = "Venonta tago";
 $langPreviousDay = "Antaŭa tago";
 $langPreviousDay = "Antaŭa tago";
-$langNextWeek = "Venonta semajno";
 $langPreviousWeek = "Pasinta semajno";
 $langPreviousWeek = "Pasinta semajno";
 $langNextMonth = "Venonta monato";
 $langNextMonth = "Venonta monato";
 $langPreviousMonth = "Pasinta monato";
 $langPreviousMonth = "Pasinta monato";

+ 1 - 0
main/lang/esperanto/trad4all.inc.php

@@ -327,6 +327,7 @@ $From = "de";
 $To = "al";
 $To = "al";
 $Category = "Kategorio";
 $Category = "Kategorio";
 $UserAge = "Aĝo";
 $UserAge = "Aĝo";
+$NextWeek = "Venonta semajno";
 $GeneralDescription = "Ĝenerala Priskribo";
 $GeneralDescription = "Ĝenerala Priskribo";
 $GeneralDescriptionQuestions = "Kiel rolas la kurso ene de la programo? Ĉu ekzistas antaŭkondiĉoj? Kiel la kurso ligiĝas kun aliaj kursoj?";
 $GeneralDescriptionQuestions = "Kiel rolas la kurso ene de la programo? Ĉu ekzistas antaŭkondiĉoj? Kiel la kurso ligiĝas kun aliaj kursoj?";
 $GeneralDescriptionInformation = "Priskribo de la kurso (nombro da horoj, oficiala kodo, klasĉambro...) kaj la instruisto (nomo, persona nomo, oficejo, telefono, retadreso...)";
 $GeneralDescriptionInformation = "Priskribo de la kurso (nombro da horoj, oficiala kodo, klasĉambro...) kaj la instruisto (nomo, persona nomo, oficejo, telefono, retadreso...)";

+ 1 - 0
main/lang/french/survey.inc.php

@@ -2,6 +2,7 @@
 /*
 /*
 for more information: see languages.txt in the lang folder.
 for more information: see languages.txt in the lang folder.
 */
 */
+$StartSurvey = "Commencer l'enquête";
 $PublishSurvey = "Publier l'enquête";
 $PublishSurvey = "Publier l'enquête";
 $CompareQuestions = "Comparer les questions";
 $CompareQuestions = "Comparer les questions";
 $InformationUpdated = "Informations mises à jour";
 $InformationUpdated = "Informations mises à jour";

+ 0 - 1
main/lang/french/tracking.inc.php

@@ -136,7 +136,6 @@ $langPeriodMonth = "Mois";
 $langPeriodYear = "Année";
 $langPeriodYear = "Année";
 $langNextDay = "Jour suivant";
 $langNextDay = "Jour suivant";
 $langPreviousDay = "Jour précédent";
 $langPreviousDay = "Jour précédent";
-$langNextWeek = "Semaine suivante";
 $langPreviousWeek = "Semaine précédente";
 $langPreviousWeek = "Semaine précédente";
 $langNextMonth = "Mois suivant";
 $langNextMonth = "Mois suivant";
 $langPreviousMonth = "Mois précédent";
 $langPreviousMonth = "Mois précédent";

+ 13 - 0
main/lang/french/trad4all.inc.php

@@ -2,6 +2,18 @@
 /*
 /*
 for more information: see languages.txt in the lang folder.
 for more information: see languages.txt in the lang folder.
 */
 */
+$CustomRange = "Période spécifique";
+$ThisWeek = "Cette semaine-ci";
+$SendToUsersInSessions = "Envoyer aux utilisateurs de toutes les sessions de ce cours";
+$ParametersNotFound = "Paramètres non trouvés";
+$UsersToAdd = "Utilisateurs à ajouter";
+$DocumentsAdded = "Documents ajoutés";
+$NoUsersToAdd = "Aucun utilisateurs à ajouter";
+$Subgroup = "Sous-groupe";
+$Subgroups = "Sous-groupes";
+$EnterTheLettersYouSee = "Introduisez les lettres que vous voyez.";
+$ClickOnTheImageForANewOne = "Cliquez sur l'image pour en charger une nouvelle.";
+$AccountBlockedByCaptcha = "Compte bloqué par CAPTCHA";
 $CatchScreenCasts = "Capturer un screenshot/screencast";
 $CatchScreenCasts = "Capturer un screenshot/screencast";
 $View = "Visualiser";
 $View = "Visualiser";
 $AmountSubmitted = "Envoyés";
 $AmountSubmitted = "Envoyés";
@@ -849,6 +861,7 @@ $FirstPage = "Première page";
 $LastPage = "Dernière page";
 $LastPage = "Dernière page";
 $Coachs = "Formateurs";
 $Coachs = "Formateurs";
 $FieldTypeFile = "Envoi de fichier";
 $FieldTypeFile = "Envoi de fichier";
+$NextWeek = "Semaine suivante";
 $DragAndDropAnElementHere = "Glisser déposer un élément ici.";
 $DragAndDropAnElementHere = "Glisser déposer un élément ici.";
 $ThereAreNoRegisteredDatetimeYet = "Il n'y a aucune date/heure enregistrée pour le moment";
 $ThereAreNoRegisteredDatetimeYet = "Il n'y a aucune date/heure enregistrée pour le moment";
 $CalendarList = "Liste calendrier des assistances";
 $CalendarList = "Liste calendrier des assistances";

+ 0 - 1
main/lang/galician/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Mes";
 $langPeriodYear = "Ano";
 $langPeriodYear = "Ano";
 $langNextDay = "Día Seguinte";
 $langNextDay = "Día Seguinte";
 $langPreviousDay = "Día Previo";
 $langPreviousDay = "Día Previo";
-$langNextWeek = "Semana Seguinte";
 $langPreviousWeek = "Semana Previa";
 $langPreviousWeek = "Semana Previa";
 $langNextMonth = "Mes Seguinte";
 $langNextMonth = "Mes Seguinte";
 $langPreviousMonth = "Mes Previo";
 $langPreviousMonth = "Mes Previo";

+ 1 - 0
main/lang/galician/trad4all.inc.php

@@ -737,6 +737,7 @@ $Until = "Ata";
 $FirstPage = "Primeira páxina";
 $FirstPage = "Primeira páxina";
 $LastPage = "Derradeira páxina";
 $LastPage = "Derradeira páxina";
 $Coachs = "Profesores";
 $Coachs = "Profesores";
+$NextWeek = "Semana Seguinte";
 $DragAndDropAnElementHere = "Arrastrar e soltar un elemento aquí.";
 $DragAndDropAnElementHere = "Arrastrar e soltar un elemento aquí.";
 $ThereAreNoRegisteredDatetimeYet = "Non hai data/hora rexistrada aínda";
 $ThereAreNoRegisteredDatetimeYet = "Non hai data/hora rexistrada aínda";
 $CalendarList = "Calendario de lista de asistencia";
 $CalendarList = "Calendario de lista de asistencia";

+ 0 - 1
main/lang/german/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Monat";
 $langPeriodYear = "Jahr";
 $langPeriodYear = "Jahr";
 $langNextDay = "Nächster Tag";
 $langNextDay = "Nächster Tag";
 $langPreviousDay = "Vorheriger Tag";
 $langPreviousDay = "Vorheriger Tag";
-$langNextWeek = "Nächste Woche";
 $langPreviousWeek = "Vorherige Woche";
 $langPreviousWeek = "Vorherige Woche";
 $langNextMonth = "Nächster Monat";
 $langNextMonth = "Nächster Monat";
 $langPreviousMonth = "Vorheriger Monat";
 $langPreviousMonth = "Vorheriger Monat";

+ 1 - 0
main/lang/german/trad4all.inc.php

@@ -732,6 +732,7 @@ $Until = "Bis";
 $FirstPage = "Erste Seite";
 $FirstPage = "Erste Seite";
 $LastPage = "Letzte Seite";
 $LastPage = "Letzte Seite";
 $Coachs = "Tutoren";
 $Coachs = "Tutoren";
+$NextWeek = "Nächste Woche";
 $DragAndDropAnElementHere = "Ein Element hier drauf ziehen und loslassen";
 $DragAndDropAnElementHere = "Ein Element hier drauf ziehen und loslassen";
 $ThereAreNoRegisteredDatetimeYet = "Es wurde noch kein(e) Datum / Uhrzeit eingetragen";
 $ThereAreNoRegisteredDatetimeYet = "Es wurde noch kein(e) Datum / Uhrzeit eingetragen";
 $CalendarList = "Kalender-Liste der Anwesenheiten";
 $CalendarList = "Kalender-Liste der Anwesenheiten";

+ 0 - 1
main/lang/greek/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Μήνας";
 $langPeriodYear = "Έτος";
 $langPeriodYear = "Έτος";
 $langNextDay = "Επόμενη μέρα";
 $langNextDay = "Επόμενη μέρα";
 $langPreviousDay = "Προηγούμενη μέρα";
 $langPreviousDay = "Προηγούμενη μέρα";
-$langNextWeek = "Επόμενη εβδομάδα";
 $langPreviousWeek = "Προηγούμενη εβδομάδα";
 $langPreviousWeek = "Προηγούμενη εβδομάδα";
 $langNextMonth = "Επόμενος μήνας";
 $langNextMonth = "Επόμενος μήνας";
 $langPreviousMonth = "Προηγούμενος Μήνας";
 $langPreviousMonth = "Προηγούμενος Μήνας";

+ 1 - 0
main/lang/greek/trad4all.inc.php

@@ -726,6 +726,7 @@ $Until = "Μέχρι";
 $FirstPage = "Πρώτη σελίδα";
 $FirstPage = "Πρώτη σελίδα";
 $LastPage = "Τελευταία σελίδα";
 $LastPage = "Τελευταία σελίδα";
 $Coachs = "Υπεύθυνοι";
 $Coachs = "Υπεύθυνοι";
+$NextWeek = "Επόμενη εβδομάδα";
 $DragAndDropAnElementHere = "Σύρετε και αφήστε ένα στοιχείο εδώ";
 $DragAndDropAnElementHere = "Σύρετε και αφήστε ένα στοιχείο εδώ";
 $ThereAreNoRegisteredDatetimeYet = "There is no date/time registered yet";
 $ThereAreNoRegisteredDatetimeYet = "There is no date/time registered yet";
 $CalendarList = "Ημερολόγιο συμμετοχών";
 $CalendarList = "Ημερολόγιο συμμετοχών";

+ 0 - 1
main/lang/hungarian/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Hónap";
 $langPeriodYear = "Év";
 $langPeriodYear = "Év";
 $langNextDay = "Következő nap";
 $langNextDay = "Következő nap";
 $langPreviousDay = "Előző nap";
 $langPreviousDay = "Előző nap";
-$langNextWeek = "Következő hét";
 $langPreviousWeek = "Előző hét";
 $langPreviousWeek = "Előző hét";
 $langNextMonth = "Következő hónap";
 $langNextMonth = "Következő hónap";
 $langPreviousMonth = "Előző hónap";
 $langPreviousMonth = "Előző hónap";

+ 1 - 0
main/lang/hungarian/trad4all.inc.php

@@ -631,6 +631,7 @@ $Menu = "Menü";
 $BackToUserList = "Vissza a felhasználói listához";
 $BackToUserList = "Vissza a felhasználói listához";
 $GraphicNotAvailable = "Kép nem található";
 $GraphicNotAvailable = "Kép nem található";
 $Parent = "Szülő";
 $Parent = "Szülő";
+$NextWeek = "Következő hét";
 $GeneralDescription = "Általános meghatározás";
 $GeneralDescription = "Általános meghatározás";
 $GeneralDescriptionQuestions = "Hol van a kurzus helye a képzési programban? Hogyan kapcsolódik a kurzus más kurzusokhoz?";
 $GeneralDescriptionQuestions = "Hol van a kurzus helye a képzési programban? Hogyan kapcsolódik a kurzus más kurzusokhoz?";
 $GeneralDescriptionInformation = "A kurzus meghatározása (órák száma, hivatalos kód, osztályterem helye, stb.) és az oktató bemutatása (név, fogadóóra ideje, helye, telefonszáma, e-mail címe)";
 $GeneralDescriptionInformation = "A kurzus meghatározása (órák száma, hivatalos kód, osztályterem helye, stb.) és az oktató bemutatása (név, fogadóóra ideje, helye, telefonszáma, e-mail címe)";

+ 0 - 1
main/lang/indonesian/tracking.inc.php

@@ -76,7 +76,6 @@ $langPeriodMonth = "Bulan";
 $langPeriodYear = "Tahun";
 $langPeriodYear = "Tahun";
 $langNextDay = "Hari Berikutnya";
 $langNextDay = "Hari Berikutnya";
 $langPreviousDay = "Hari Sebelumnya";
 $langPreviousDay = "Hari Sebelumnya";
-$langNextWeek = "Minggu Berikutnya";
 $langPreviousWeek = "Minggu Sebelumnya";
 $langPreviousWeek = "Minggu Sebelumnya";
 $langNextMonth = "Bulan Berikutnya";
 $langNextMonth = "Bulan Berikutnya";
 $langPreviousMonth = "Bulan Sebelumnya";
 $langPreviousMonth = "Bulan Sebelumnya";

+ 1 - 0
main/lang/indonesian/trad4all.inc.php

@@ -310,6 +310,7 @@ $CourseAdminRoleDescription = "Admin Mata Kuliah";
 $h = "h";
 $h = "h";
 $CreateNewGlobalRole = "Buat role/peran global baru";
 $CreateNewGlobalRole = "Buat role/peran global baru";
 $CreateNewLocalRole = "Buat role/peran lokal baru";
 $CreateNewLocalRole = "Buat role/peran lokal baru";
+$NextWeek = "Minggu Berikutnya";
 $GeneralDescription = "Deskripsi Umum";
 $GeneralDescription = "Deskripsi Umum";
 $GeneralDescriptionQuestions = "Dimana tempat mata kuliah dalam program? Adakah pra-syarat? Bagaimana keterkaitan mata kulliah ini dengan mata kuliah lain?";
 $GeneralDescriptionQuestions = "Dimana tempat mata kuliah dalam program? Adakah pra-syarat? Bagaimana keterkaitan mata kulliah ini dengan mata kuliah lain?";
 $GeneralDescriptionInformation = "Deskripsi mata kuliah (jumlah jam, kode resmi, ruang ...) dan pengajar (nama,  kantor, telp., email ...).";
 $GeneralDescriptionInformation = "Deskripsi mata kuliah (jumlah jam, kode resmi, ruang ...) dan pengajar (nama,  kantor, telp., email ...).";

+ 0 - 1
main/lang/italian/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Mese";
 $langPeriodYear = "Anno";
 $langPeriodYear = "Anno";
 $langNextDay = "Giorno successivo";
 $langNextDay = "Giorno successivo";
 $langPreviousDay = "Giorno precedente";
 $langPreviousDay = "Giorno precedente";
-$langNextWeek = "Settimana successiva";
 $langPreviousWeek = "Settimana precedente";
 $langPreviousWeek = "Settimana precedente";
 $langNextMonth = "Mese successivo";
 $langNextMonth = "Mese successivo";
 $langPreviousMonth = "Mese precedente";
 $langPreviousMonth = "Mese precedente";

+ 1 - 0
main/lang/italian/trad4all.inc.php

@@ -729,6 +729,7 @@ $Until = "Fino a";
 $FirstPage = "Prima pagina";
 $FirstPage = "Prima pagina";
 $LastPage = "Ultima pagina";
 $LastPage = "Ultima pagina";
 $Coachs = "Tutor";
 $Coachs = "Tutor";
+$NextWeek = "Settimana successiva";
 $ThereAreNoRegisteredDatetimeYet = "Non ci sono ancora indicazioni sulla data e l'ora";
 $ThereAreNoRegisteredDatetimeYet = "Non ci sono ancora indicazioni sulla data e l'ora";
 $CalendarList = "Calendario delle presenze";
 $CalendarList = "Calendario delle presenze";
 $AttendanceCalendarDescription = "Il calendario delle presenze ti permette di registrare le presenze per le sessioni che i corsisti devono frequentare. Crea qui un nuovo calendario.";
 $AttendanceCalendarDescription = "Il calendario delle presenze ti permette di registrare le presenze per le sessioni che i corsisti devono frequentare. Crea qui un nuovo calendario.";

+ 0 - 1
main/lang/korean/tracking.inc.php

@@ -72,7 +72,6 @@ $langPeriodMonth = "달";
 $langPeriodYear = "해";
 $langPeriodYear = "해";
 $langNextDay = "하루 후";
 $langNextDay = "하루 후";
 $langPreviousDay = "하루 전";
 $langPreviousDay = "하루 전";
-$langNextWeek = "다음 주";
 $langPreviousWeek = "이전 주";
 $langPreviousWeek = "이전 주";
 $langNextMonth = "다음 달";
 $langNextMonth = "다음 달";
 $langPreviousMonth = "이전 달";
 $langPreviousMonth = "이전 달";

+ 1 - 0
main/lang/korean/trad4all.inc.php

@@ -280,6 +280,7 @@ $OnlyLettersAndNumbersAllowed = "문자와 숫자만 허용됩니다";
 $CourseAdminRole = "과정 관리자";
 $CourseAdminRole = "과정 관리자";
 $UserRole = "역할";
 $UserRole = "역할";
 $OnlyImagesAllowed = "PNG, JPG 또는 GIF 형식의 파일만 허용됩니다";
 $OnlyImagesAllowed = "PNG, JPG 또는 GIF 형식의 파일만 허용됩니다";
+$NextWeek = "다음 주";
 $GeneralDescription = "일반적 설명";
 $GeneralDescription = "일반적 설명";
 $GeneralDescriptionQuestions = "이 프로그램에서 이 과정은 어느 단계입니까? 선수조건이 있습니까? 다른 과정과 어떻게 연계됩니까?";
 $GeneralDescriptionQuestions = "이 프로그램에서 이 과정은 어느 단계입니까? 선수조건이 있습니까? 다른 과정과 어떻게 연계됩니까?";
 $GeneralDescriptionInformation = "과정 설명( 시수, 공식 코드, 교실)과 교사(이름, 성, 사무실, 전화번호, 이메일...)";
 $GeneralDescriptionInformation = "과정 설명( 시수, 공식 코드, 교실)과 교사(이름, 성, 사무실, 전화번호, 이메일...)";

+ 0 - 1
main/lang/latvian/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Mēnesis";
 $langPeriodYear = "Gads";
 $langPeriodYear = "Gads";
 $langNextDay = "Nākošā diena";
 $langNextDay = "Nākošā diena";
 $langPreviousDay = "Iepriekšējā diena";
 $langPreviousDay = "Iepriekšējā diena";
-$langNextWeek = "Nākošā nedēļa";
 $langPreviousWeek = "Iepriekšējā nedēļa";
 $langPreviousWeek = "Iepriekšējā nedēļa";
 $langNextMonth = "Nākošais mēnesis";
 $langNextMonth = "Nākošais mēnesis";
 $langPreviousMonth = "Iepriekšējais mēnesis";
 $langPreviousMonth = "Iepriekšējais mēnesis";

+ 1 - 0
main/lang/latvian/trad4all.inc.php

@@ -735,6 +735,7 @@ $Until = "Līdz";
 $FirstPage = "Pirmā lapa";
 $FirstPage = "Pirmā lapa";
 $LastPage = "Pēdējā lapa";
 $LastPage = "Pēdējā lapa";
 $Coachs = "Mācību spēki";
 $Coachs = "Mācību spēki";
+$NextWeek = "Nākošā nedēļa";
 $DragAndDropAnElementHere = "Vilkt un nomest elementu šeit";
 $DragAndDropAnElementHere = "Vilkt un nomest elementu šeit";
 $ThereAreNoRegisteredDatetimeYet = "Šeit vēl nav datuma / laika reģistra";
 $ThereAreNoRegisteredDatetimeYet = "Šeit vēl nav datuma / laika reģistra";
 $CalendarList = "Plānoto Klātienes nodarbību diena un laiks";
 $CalendarList = "Plānoto Klātienes nodarbību diena un laiks";

+ 0 - 1
main/lang/lithuanian/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Mėnuo";
 $langPeriodYear = "Metai";
 $langPeriodYear = "Metai";
 $langNextDay = "Kita diena";
 $langNextDay = "Kita diena";
 $langPreviousDay = "Ankstesnė diena";
 $langPreviousDay = "Ankstesnė diena";
-$langNextWeek = "Kita savaitė";
 $langPreviousWeek = "Ankstesnė savaitė";
 $langPreviousWeek = "Ankstesnė savaitė";
 $langNextMonth = "Kitas mėnuo";
 $langNextMonth = "Kitas mėnuo";
 $langPreviousMonth = "Ankstesnis mėnuo";
 $langPreviousMonth = "Ankstesnis mėnuo";

+ 1 - 0
main/lang/lithuanian/trad4all.inc.php

@@ -415,6 +415,7 @@ $SeeDetail = "See detail";
 $GroupSingle = "Group";
 $GroupSingle = "Group";
 $PleaseLoginAgainFromHomepage = "Please try to login again from the homepage";
 $PleaseLoginAgainFromHomepage = "Please try to login again from the homepage";
 $PleaseLoginAgainFromFormBelow = "Please try to login again using the form below";
 $PleaseLoginAgainFromFormBelow = "Please try to login again using the form below";
+$NextWeek = "Kita savaitė";
 $GeneralDescription = "Apibūdinimas";
 $GeneralDescription = "Apibūdinimas";
 $GeneralDescriptionQuestions = "Koks kurso vaidmuo studijų modulyje? Ar yra kokių išankstinių reikalavimų? Kaip šis kursas siejasi su kitais kursais?";
 $GeneralDescriptionQuestions = "Koks kurso vaidmuo studijų modulyje? Ar yra kokių išankstinių reikalavimų? Kaip šis kursas siejasi su kitais kursais?";
 $GeneralDescriptionInformation = "Apibūdinkite kursą (valandų skaičius, oficialus kodas, kokiai auditorijai jis skirtas...) ir dėstytoją (vardas, pavardė, pareigos, telefonas, el. pašto adresas...).";
 $GeneralDescriptionInformation = "Apibūdinkite kursą (valandų skaičius, oficialus kodas, kokiai auditorijai jis skirtas...) ir dėstytoją (vardas, pavardė, pareigos, telefonas, el. pašto adresas...).";

+ 0 - 1
main/lang/macedonian/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Месец";
 $langPeriodYear = "Година";
 $langPeriodYear = "Година";
 $langNextDay = "Следниот ден";
 $langNextDay = "Следниот ден";
 $langPreviousDay = "Претходниот ден";
 $langPreviousDay = "Претходниот ден";
-$langNextWeek = "Следната седмица";
 $langPreviousWeek = "Претходната седмица";
 $langPreviousWeek = "Претходната седмица";
 $langNextMonth = "Следниот месец";
 $langNextMonth = "Следниот месец";
 $langPreviousMonth = "Претходниот месец";
 $langPreviousMonth = "Претходниот месец";

+ 1 - 0
main/lang/macedonian/trad4all.inc.php

@@ -447,6 +447,7 @@ $DearUser = "Драг кориснику";
 $YourRegistrationData = "Вашите регистрациони податоци";
 $YourRegistrationData = "Вашите регистрациони податоци";
 $ResetLink = "Кликнете овде за да ја препокриете Вашата лозинка";
 $ResetLink = "Кликнете овде за да ја препокриете Вашата лозинка";
 $VisibilityChanged = "Видливоста е променета.";
 $VisibilityChanged = "Видливоста е променета.";
+$NextWeek = "Следната седмица";
 $GeneralDescription = "Општ Опис";
 $GeneralDescription = "Општ Опис";
 $GeneralDescriptionQuestions = "Кое е местото на курсот во програмата? Потебни ли се предзнаења? Како е курсот поврзан со другите курсеви?";
 $GeneralDescriptionQuestions = "Кое е местото на курсот во програмата? Потебни ли се предзнаења? Како е курсот поврзан со другите курсеви?";
 $GeneralDescriptionInformation = "Опишете го курсот (број на часови, официјална шифра, соба каде што се случува ...) и учителот (име, презиме, канцеларија, телефон, e-mail, ...)";
 $GeneralDescriptionInformation = "Опишете го курсот (број на часови, официјална шифра, соба каде што се случува ...) и учителот (име, презиме, канцеларија, телефон, e-mail, ...)";

+ 0 - 1
main/lang/malay/tracking.inc.php

@@ -68,7 +68,6 @@ $langPeriodMonth = "Bulan";
 $langPeriodYear = "Tahun";
 $langPeriodYear = "Tahun";
 $langNextDay = "Hari Seterusnya";
 $langNextDay = "Hari Seterusnya";
 $langPreviousDay = "Hari Sebelumnya";
 $langPreviousDay = "Hari Sebelumnya";
-$langNextWeek = "Minggu Seterusnya";
 $langPreviousWeek = "Minggu Sebelumnya";
 $langPreviousWeek = "Minggu Sebelumnya";
 $langNextMonth = "Bulan Seterusnya";
 $langNextMonth = "Bulan Seterusnya";
 $langPreviousMonth = "Bulan Sebelumnya";
 $langPreviousMonth = "Bulan Sebelumnya";

+ 1 - 0
main/lang/malay/trad4all.inc.php

@@ -79,4 +79,5 @@ $langMyCourses = "Senarai Subjek";
 $langModifyProfile = "Kemaskini Butir Peribadi";
 $langModifyProfile = "Kemaskini Butir Peribadi";
 $langMyStats = "Papar Statistik";
 $langMyStats = "Papar Statistik";
 $langLogout = "Keluar";
 $langLogout = "Keluar";
+$NextWeek = "Minggu Seterusnya";
 ?>
 ?>

+ 0 - 1
main/lang/norwegian/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Måned";
 $langPeriodYear = "År";
 $langPeriodYear = "År";
 $langNextDay = "Neste dag";
 $langNextDay = "Neste dag";
 $langPreviousDay = "Foregående dag";
 $langPreviousDay = "Foregående dag";
-$langNextWeek = "Neste uke";
 $langPreviousWeek = "Foregående uke";
 $langPreviousWeek = "Foregående uke";
 $langNextMonth = "Neste måned";
 $langNextMonth = "Neste måned";
 $langPreviousMonth = "Foregående måned";
 $langPreviousMonth = "Foregående måned";

+ 1 - 0
main/lang/norwegian/trad4all.inc.php

@@ -305,6 +305,7 @@ $Progress = "Fremdrift";
 $MyProgress = "Min fremdrift";
 $MyProgress = "Min fremdrift";
 $MyGradebook = "Min karakterbok";
 $MyGradebook = "Min karakterbok";
 $Gradebook = "Karakterbok";
 $Gradebook = "Karakterbok";
+$NextWeek = "Neste uke";
 $GeneralDescription = "Generell beskrivelse";
 $GeneralDescription = "Generell beskrivelse";
 $Objectives = "Målsettning";
 $Objectives = "Målsettning";
 $Topics = "Emner";
 $Topics = "Emner";

+ 0 - 1
main/lang/persian/tracking.inc.php

@@ -76,7 +76,6 @@ $langPeriodMonth = "ماه";
 $langPeriodYear = "سال";
 $langPeriodYear = "سال";
 $langNextDay = "روز\nبعد";
 $langNextDay = "روز\nبعد";
 $langPreviousDay = "روز\nقبل";
 $langPreviousDay = "روز\nقبل";
-$langNextWeek = "هفتۀ\nآینده";
 $langPreviousWeek = "هفتۀ\nپیش";
 $langPreviousWeek = "هفتۀ\nپیش";
 $langNextMonth = "ماه\nآینده";
 $langNextMonth = "ماه\nآینده";
 $langPreviousMonth = "ماه\nپیش";
 $langPreviousMonth = "ماه\nپیش";

+ 1 - 0
main/lang/persian/trad4all.inc.php

@@ -707,6 +707,7 @@ $Until = "تا";
 $FirstPage = "اولین صفحه";
 $FirstPage = "اولین صفحه";
 $LastPage = "آخرین صفحه";
 $LastPage = "آخرین صفحه";
 $Coachs = "مربی ها";
 $Coachs = "مربی ها";
+$NextWeek = "هفتۀ\nآینده";
 $ThereAreNoRegisteredDatetimeYet = "هیچ تاریخ و زمانی تا بحال ثبت نشده است";
 $ThereAreNoRegisteredDatetimeYet = "هیچ تاریخ و زمانی تا بحال ثبت نشده است";
 $CalendarList = "فهرست تقویم مشارکت کنندگان";
 $CalendarList = "فهرست تقویم مشارکت کنندگان";
 $CleanCalendar = "پاک کردن تقویم تمام فهرست ها";
 $CleanCalendar = "پاک کردن تقویم تمام فهرست ها";

+ 0 - 1
main/lang/polish/tracking.inc.php

@@ -89,7 +89,6 @@ $langPeriodMonth = "Miesiąc";
 $langPeriodYear = "Rok";
 $langPeriodYear = "Rok";
 $langNextDay = "Następny dzień";
 $langNextDay = "Następny dzień";
 $langPreviousDay = "Poprzedni dzień";
 $langPreviousDay = "Poprzedni dzień";
-$langNextWeek = "Następny tydzień";
 $langPreviousWeek = "Poprzedni tydzień";
 $langPreviousWeek = "Poprzedni tydzień";
 $langNextMonth = "Następny miesiąc";
 $langNextMonth = "Następny miesiąc";
 $langPreviousMonth = "Poprzedni miesiąc";
 $langPreviousMonth = "Poprzedni miesiąc";

+ 1 - 0
main/lang/polish/trad4all.inc.php

@@ -755,6 +755,7 @@ $Until = "Do";
 $FirstPage = "Pierwsza strona";
 $FirstPage = "Pierwsza strona";
 $LastPage = "Ostatnia strona";
 $LastPage = "Ostatnia strona";
 $Coachs = "Trenerzy";
 $Coachs = "Trenerzy";
+$NextWeek = "Następny tydzień";
 $DragAndDropAnElementHere = "Przeciągnij i upuść element tutaj";
 $DragAndDropAnElementHere = "Przeciągnij i upuść element tutaj";
 $ThereAreNoRegisteredDatetimeYet = "Nie ma jeszcze zarejestrowanej daty/czasu";
 $ThereAreNoRegisteredDatetimeYet = "Nie ma jeszcze zarejestrowanej daty/czasu";
 $CalendarList = "Lista kalendarza frekwencji";
 $CalendarList = "Lista kalendarza frekwencji";

+ 114 - 1
main/lang/portuguese/tracking.inc.php

@@ -22,6 +22,34 @@ $AssignmentsTotal = "Total de trabalhos/tarefas";
 $ForumsProgress = "Progresso do fórum";
 $ForumsProgress = "Progresso do fórum";
 $ForumsLeft = "Fórums sem qualquer leitura";
 $ForumsLeft = "Fórums sem qualquer leitura";
 $ForumsDone = "Fórums lidos";
 $ForumsDone = "Fórums lidos";
+$ForumsTotal = "Total de fórums";
+$ExercisesProgress = "Progresso dos exercícios";
+$ExercisesLeft = "Exercícios incompletos";
+$ExercisesDone = "Exercícios completos";
+$ExercisesTotal = "Total de exercícios";
+$CourseDescriptionProgress = "Progresso da descrição dos cursos";
+$LearnpathsProgress = "Progresso das Rotas de Aprendizagem";
+$LearnpathsLeft = "Rotas de Aprendizagem incompletas";
+$LearnpathsDone = "Rotas de Aprendizagem completas";
+$LearnpathsTotal = "Total de Rotas de Aprendizagem";
+$TimeLoggedIn = "Tempo online (hh:mm)";
+$AnswerIndicator = "Estado das respostas";
+$ChooseSurvey = "Por favor escolha um questionário";
+$SearchSurvey = "Procurar questionários";
+$ChooseExercise = "Por favor escolha um exercício";
+$SearchExercise = "Procurar exercícios";
+$ChooseSession = "Por favor escolha uma sessão";
+$SearchSession = "Procurar sessões";
+$ChooseStudent = "Por favor escolha um aluno";
+$SearchStudent = "Procurar utilizadores";
+$ChooseCourse = "Por favor escolha um curso";
+$SearchCourse = "Procurar cursos";
+$DisplaySurveyOverview = "Visão global dos questionários";
+$DisplayProgressOverview = "Visão do progresso da leitura e participação";
+$DisplayLpProgressOverview = "Visão do progresso das Rotas de Aprendizagem";
+$DisplayExerciseProgress = "Detalhes do progresso dos exercícios";
+$DisplayAccessOverview = "Visão dos acessos por utilizador";
+$AssignSessionsTo = "Atribuir sessões a";
 $langToolName = "Importar cursos do Blackboard";
 $langToolName = "Importar cursos do Blackboard";
 $TrackingDisabled = "Os relatórios foram desactivados pelo administrador do sistema.";
 $TrackingDisabled = "Os relatórios foram desactivados pelo administrador do sistema.";
 $InactivesStudents = "Utilizadores inactivos";
 $InactivesStudents = "Utilizadores inactivos";
@@ -108,7 +136,6 @@ $langPeriodMonth = "Mês";
 $langPeriodYear = "Ano";
 $langPeriodYear = "Ano";
 $langNextDay = "Dia seguinte";
 $langNextDay = "Dia seguinte";
 $langPreviousDay = "Dia anterior";
 $langPreviousDay = "Dia anterior";
-$langNextWeek = "Semana seguinte";
 $langPreviousWeek = "Semana anterior";
 $langPreviousWeek = "Semana anterior";
 $langNextMonth = "Mês seguinte";
 $langNextMonth = "Mês seguinte";
 $langPreviousMonth = "Mês anterior";
 $langPreviousMonth = "Mês anterior";
@@ -264,4 +291,90 @@ $ViewMinus = "Visualizar menos";
 $ResourcesTracking = "Relatório sobre o recurso";
 $ResourcesTracking = "Relatório sobre o recurso";
 $SelectFieldToAdd = "Seleccione o campo de perfil do utilizador para adicionar";
 $SelectFieldToAdd = "Seleccione o campo de perfil do utilizador para adicionar";
 $AddAdditionalProfileField = "Adicionar campo de perfil de utilizador";
 $AddAdditionalProfileField = "Adicionar campo de perfil de utilizador";
+$ConfigureExtensions = "Configurar extensões";
+$DashboardBlocks = "Módulos do Painel";
+$DashboardList = "Lista do Painel";
+$YouHaveNotEnabledBlocks = "Não tem ativo nenhum módulo";
+$BlocksHaveBeenUpdatedSuccessfully = "Os módulos foram atualizados";
+$AttendanceSheetDescription = "As páginas de presenças permitem reunir todas as presenças dos grupos por grupo. Por exemplo, pode querer tratar as presenças em lições teóricas à parte das presenças em lições práticas. Cada uma delas mostrará os alunos a assistir. Depende de si registar os alunos a faltar clicando nas respetivas caixas de seleção.";
+$AttendanceSheetReport = "Relatório com lista de presenças";
+$YouDoNotHaveDoneAttendances = "Não tem presenças registadas";
+$GoToAttendanceCalendarList = "Ir para vista de calendário de marcações";
+$AddADateTime = "Adicionar data e horas";
+$AreYouSureToDeleteAllDates = "Tem a certeza de que deseja apagar todas as datas?";
+$DashboardPluginsHaveBeenUpdatedSuccessfully = "Os plugins do Painel foram atualizados com sucesso";
+$ThereIsNoInformationAboutYourCourses = "Não existe informação disponível sobre os seus cursos";
+$ThereIsNoInformationAboutYourSessions = "Não existe informação disponível sobre as suas sessões";
+$ThereIsNoInformationAboutYourTeachers = "Não existe informação disponível sobre os seus professores";
+$ThereIsNoInformationAboutYourStudents = "Não existe informação disponível sobre os seus alunos";
+$TimeSpentLastWeek = "Tempo dispendido na última semana";
+$DateLock = "Bloquear data";
+$CountOfUsers = "Número de utilizadores";
+$CountOfSubscriptions = "Número de inscrições";
+$FolderCreated = "Nova pasta criada";
+$LearnpathVisible = "Rota de Aprendizagem tornada visível";
+$LinkInvisible = "Link/ligação tornado visível";
+$LinkAdded = "Link/ligação adicionado";
+$Minutes = "Minutos";
+$BackupCreated = "Backup criado";
+$CountCertificates = "Número de certificados";
+$AverageHoursPerStudent = "Média de horas/aluno";
+$CountOfSubscribedUsers = "Número de utilizadores inscritos";
+$TrainingHoursAccumulated = "Horas de aulas acumuladas";
+$ManHours = "Produtividade por aluno (trabalho/hora)";
+$NotesObtained = "Notas obtidas";
+$DisplayCourseOverview = "Visão dos cursos";
+$DisplaySessionOverview = "Visão das sessões";
+$TotalNumberOfMessages = "Número total de mensagens";
+$TotalNumberOfAssignments = "Número total de trabalhos/tarefas";
+$LastLogins = "Últimas entradas (logins)";
+$AllLogins = "Todas as entradas (logins)";
+$LPExerciseResultsBySession = "Resultados dos exercícios das Rotas de Aprendizagem por sessão";
+$LPQuestionListResults = "Resultados dos exercícios das Rotas de Aprendizagem";
+$PleaseSelectACourse = "Por favor selecione um curso";
+$StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts = "A pontuação média do aluno é calculada com base em todas as Rotas de Aprendizagem e todas as tentativas";
+$AverageScore = "Média de resultados";
+$LastConnexionDate = "Data da última entrada";
+$QuestionsAreTakenFromLPExercises = "Estas questões foram selecionadas das Rotas de Aprendizagem";
+$AllStudentsAttemptsAreConsidered = "Todas as tentativas dos alunos são consideradas";
+$PublishedExercises = "Exercícios disponíveis";
+$DoneExercises = "Exercícios tentados";
+$AverageExerciseResult = "Média de resultados dos exercícios";
+$LPProgress = "Progresso na Rota de Aprendizagem";
+$Ranking = "Ranking";
+$BestResultInCourse = "Melhor resultado no curso";
+$ExerciseStartDate = "Data de publicação";
+$OnlyBestResultsPerStudent = "No caso de múltiplas tentativas, apenas é mostrado o melhor resultado de cada aluno";
+$BestAttempt = "Melhor tentativa";
+$ExercisesInTimeProgressChart = "Progresso dos seus exercícios comparados com a média dos outros alunos";
+$AverageIsCalculatedBasedInAllAttempts = "A média é calculada com base em todas as tentativas nos testes";
+$AverageIsCalculatedBasedInTheLatestAttempts = "A média é calculada com base nas últimas tentativas";
+$LatestAttemptAverageScore = "Média dos resultados das últimas tentativas";
+$Untitled = "Sem título";
+$Quantity = "Quantidade";
+$UploadedDocuments = "Documentos enviados";
+$ExerciseProgress = "Progresso no exercício";
+$NumberOfStudents = "Número de alunos";
+$NumberStudentsAccessingCourse = "Número de alunos a entrar no curso";
+$PercentageStudentsAccessingCourse = "Percentagem de alunos a entrar no curso";
+$NumberStudentsCompleteAllActivities = "Número de alunos que completaram todas as atividades (progresso 100%)";
+$PercentageStudentsCompleteAllActivities = "Percentagem de alunos que completou todas as atividades (100%)";
+$AverageOfActivitiesCompletedPerStudent = "Média de atividades completada por aluno";
+$TotalTimeSpentInTheCourse = "Tempo total dispendido no curso";
+$AverageTimePerStudentInCourse = "Tempo médio dispendido por aluno no curso";
+$NumberOfDocumentsInLearnpath = "Número de documentos na Rota de Aprendizagem";
+$NumberOfExercisesInLearnpath = "Número de exercícios na Rota de Aprendizagem";
+$NumberOfLinksInLearnpath = "Número de links/ligações na Rota de Aprendizagem";
+$NumberOfForumsInLearnpath = "Número de fóruns na Rota de Aprendizagem";
+$NumberOfAssignmentsInLearnpath = "Número de tarefas/trabalhos na Rota de Aprendizagem";
+$NumberOfAnnouncementsInCourse = "Número de avisos/informações no curso";
+$CurrentCoursesReport = "Relatório de cursos atual";
+$NumberOfPublishedExercises = "# de exercícios publicados";
+$NumberOfPublishedLps = "# de Rotas de Aprendizagem publicadas";
+$EventType = "Tipo de evento";
+$NbInactiveSessions = "Número de sessões inativas";
+$FollowedSessions = "Sessões seguidas";
+$FollowedCourses = "Cursos seguidos";
+$FollowedUsers = "Utilizadores seguidos";
+$Timeline = "Cronograma";
 ?>
 ?>

+ 1 - 0
main/lang/portuguese/trad4all.inc.php

@@ -828,6 +828,7 @@ $Until = "Até";
 $FirstPage = "Primeira página";
 $FirstPage = "Primeira página";
 $LastPage = "Última página";
 $LastPage = "Última página";
 $Coachs = "Tutores";
 $Coachs = "Tutores";
+$NextWeek = "Semana seguinte";
 $GeneralDescription = "Descrição";
 $GeneralDescription = "Descrição";
 $GeneralDescriptionQuestions = "Qual é o objectivo deste curso? Existem pré-requisitos? De que forma é que este curso está interligado com outros cursos?";
 $GeneralDescriptionQuestions = "Qual é o objectivo deste curso? Existem pré-requisitos? De que forma é que este curso está interligado com outros cursos?";
 $GeneralDescriptionInformation = "Descreva o curso (número de horas, número sser, localização) e o instrutor (nome, escritório, tel., E-mail, o horário de expediente....).";
 $GeneralDescriptionInformation = "Descreva o curso (número de horas, número sser, localização) e o instrutor (nome, escritório, tel., E-mail, o horário de expediente....).";

+ 0 - 1
main/lang/quechua_cusco/tracking.inc.php

@@ -88,7 +88,6 @@ $langPeriodMonth = "Killa";
 $langPeriodYear = "Wata";
 $langPeriodYear = "Wata";
 $langNextDay = "Hamuq p'unchay";
 $langNextDay = "Hamuq p'unchay";
 $langPreviousDay = "Ñaupaq p'unchay";
 $langPreviousDay = "Ñaupaq p'unchay";
-$langNextWeek = "Hamuq qanchis p'unchayuq";
 $langPreviousWeek = "Ñaupaq qanchis p'unchayuq";
 $langPreviousWeek = "Ñaupaq qanchis p'unchayuq";
 $langNextMonth = "Hamuq killa";
 $langNextMonth = "Hamuq killa";
 $langPreviousMonth = "Ñaupaq killa";
 $langPreviousMonth = "Ñaupaq killa";

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov