Merge

main/announcements/announcements.php

@@ -211,7 +211,7 @@ $htmlHeadXtra[] = to_javascript();
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){
-$("#announcement_title").focus();
+$("#emailTitle").focus();
 }
 $(document).ready(function () {
   setFocus();
@@ -1125,7 +1125,7 @@ if ($display_form == true) {
 				</div>
 				<div class="formw">
 
-					<input type="text" id="announcement_title" name="emailTitle" value="'.Security::remove_XSS($title_to_modify).'" size="60">
+					<input type="text" id="emailTitle" name="emailTitle" value="'.Security::remove_XSS($title_to_modify).'" size="60">
 				</div>
 			</div>';
 

main/exercice/admin.php

@@ -448,6 +448,7 @@ function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
 }
 // -->
 </script>";
+
 Display::display_header($nameTools,'Exercise');
 
 echo '<div class="actions">';

main/exercice/exercise.class.php

@@ -7,7 +7,6 @@
 * 	@author Olivier Brouckaert
 * 	@version $Id: exercise.class.php 22046 2009-07-14 01:45:19Z ivantcholakov $
 */
-require_once '../inc/global.inc.php';
 
 define('ALL_ON_ONE_PAGE',1);
 define('ONE_PER_PAGE',2);
@@ -15,16 +14,6 @@ define('EXERCISE_FEEDBACK_TYPE_END',0);
 define('EXERCISE_FEEDBACK_TYPE_DIRECT',1);
 define('EXERCISE_FEEDBACK_TYPE_EXAM',2);
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
-$htmlHeadXtra[] = '<script type="text/javascript">
-function setFocus(){
-$("#exercise_title").focus();
-}
-$(document).ready(function () {
-  setFocus();
-});
-</script>';
-
 if(!class_exists('Exercise')):
 
 class Exercise

main/exercice/exercise_admin.php

@@ -124,6 +124,16 @@ $htmlHeadXtra[] = '<script>
                    
 		</script>';
 
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#exercise_title").focus();
+}
+$(document).ready(function () {
+  setFocus();
+});
+</script>';
+
 /*********************
  * INIT EXERCISE
  *********************/

main/exercice/question_pool.php

@@ -39,7 +39,7 @@ $language_file='exercice';
 include('exercise.class.php');
 include('question.class.php');
 include('answer.class.php');
-include('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 
 $this_section=SECTION_COURSES;
 
@@ -267,11 +267,8 @@ if($is_allowedToEdit)
 	
 	<button class="save" type="submit" name="name" value="<?php echo get_lang('Ok') ?>"><?php echo get_lang('Ok') ?></button>
 	<?php
-    if(!empty($fromExercise)) {
-		echo '<a href="admin.php?',api_get_cidreq(),'&exerciseId=',$fromExercise,'">'.Display::return_icon('message_reply_forum.png', get_lang('GoBackToQuestionList')),get_lang('GoBackToQuestionList'),'</a>';
-	} else {
     echo '<a href="admin.php?',api_get_cidreq(),'&newQuestion=yes">'.Display::return_icon('new_test.gif'),get_lang('NewQu'),'</a>';
-	}
+	echo '<a href="admin.php?',api_get_cidreq(),'&exerciseId=',$fromExercise,'">'.Display::return_icon('message_reply_forum.png', get_lang('GoBackToQuestionList')),get_lang('GoBackToQuestionList'),'</a>';	
 	?>
     </form>
 </div>

main/lang/english/survey.inc.php

@@ -202,4 +202,5 @@ $BackToSurvey = "Back to survey";
 $UpdateInformation = "Update information";
 $PleaseFillSurvey = "Please fill survey";
 $ReportingOverview = "Reporting overview";
+$ThereAreNotQuestionsForthisSurvey = "There are not questions for this survey";
 ?>

main/lang/english/userInfo.inc.php

@@ -188,4 +188,5 @@ $YouHaveReceivedANewMessageInTheGroupX = "You have received a new message in the
 $ClickHereToSeeMessageGroup = "Click here to see message group";
 $OrCopyPasteTheFollowingUrl = "Or copy paste the following url";
 $ThereIsANewMessageInTheGroupX = "There is a new message in the group %s";
+$UserIsAlreadySubscribedToThisGroup = "User is already subscribed to this group";
 ?>

main/lang/english/wiki.inc.php

@@ -176,4 +176,5 @@ $Feedback3 = "Third message";
 $FProgress = "Progress";
 $PutATimeLimit = "Set a time limit";
 $StandardTask = "Standard Task";
+$ThePageHasBeenExportedToDocArea = "The page has been exported to doc area";
 ?>

main/lang/spanish/survey.inc.php

@@ -202,4 +202,5 @@ $BackToSurvey = "Volver a la encuesta";
 $UpdateInformation = "Actualización de información";
 $PleaseFillSurvey = "Por favor, llene la encuesta";
 $ReportingOverview = "Sumario de informes";
+$ThereAreNotQuestionsForthisSurvey = "No hay preguntas para esta encuesta";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -764,7 +764,7 @@ $UserAdded = "Usuario agregado";
 $UpdatedIn = "Actualizado";
 $Metadata = "Metadatos";
 $langAddMetadata  = "Ver/Editar Metadatos";
-$SendMessage = "Enviar Mensaje";
+$SendMessage = "Enviar mensaje";
 $SeeForum = "Ver foro";
 $SeeMore = "Ver más";
 $NoDataAvailable = "No hay datos disponibles";

main/lang/spanish/userInfo.inc.php

@@ -160,7 +160,7 @@ $DeleteFromGroup = "Eliminar de grupo";
 $GroupMembers = "Miembros del grupo";
 $Subscribe = "Inscribir";
 $YouAreInvitedToGroupContent = "Ud. esta invitado al contenido del grupo";
-$YouAreInvitedToGroup = "Tu estas invitado a unirte al grupo";
+$YouAreInvitedToGroup = "Estas invitado a unirte al grupo";
 $ToSubscribeClickInTheLinkBelow = "Para inscribirte has clic en el siguiente enlace";
 $ReturnToInbox = "Regresar a bandeja de entrada";
 $View = "Vista";
@@ -188,4 +188,5 @@ $YouHaveReceivedANewMessageInTheGroupX = "Usted ha recibido un nuevo mensaje en
 $ClickHereToSeeMessageGroup = "Clic aquí para ver el mensaje de grupo";
 $OrCopyPasteTheFollowingUrl = "O copiar y pegar la siguente url";
 $ThereIsANewMessageInTheGroupX = "Hay un nuevo mensaje en el grupo %s";
+$UserIsAlreadySubscribedToThisGroup = "El usuario ya esta suscrito a este grupo";
 ?>

main/lang/spanish/wiki.inc.php

@@ -176,4 +176,5 @@ $Feedback3 = "Tercer mensaje";
 $FProgress = "Progreso";
 $PutATimeLimit = "Establecer una limitación temporal";
 $StandardTask = "Tarea estándard";
+$ThePageHasBeenExportedToDocArea = "La página ha sido exportada al área de documentos";
 ?>

main/wiki/diff.inc.php

@@ -116,15 +116,15 @@
     {
         $content = array();
 
-        if ( strpos( $str, "\r\n" ) != false )
+        if ( api_strpos( $str, "\r\n" ) !== false )
         {
             $content = explode("\r\n", $str );
         }
-        elseif ( strpos( $str, "\n" ) != false )
+        elseif ( api_strpos( $str, "\n" ) !== false )
         {
             $content = explode( "\n", $str );
         }
-        elseif ( strpos( $str, "\r" ) != false )
+        elseif ( api_strpos( $str, "\r" ) !== false )
         {
             $content = explode( "\r", $str );
         }

main/wiki/wiki.inc.php

@@ -97,7 +97,7 @@ function links_to($input)
 		if ($input_array[$key-1]=='[[' AND $input_array[$key+1]==']]')
 		{
 
-		    if (strpos($value, "|") != false)
+		    if (api_strpos($value, "|") !== false)
 			{
 			 	$full_link_array=explode("|", $value);
 				$link=trim($full_link_array[0]);
@@ -241,7 +241,7 @@ function make_wiki_link_clickable($input)
 		/////////
 
 			//now full wikilink
-			if (strpos($value, "|") != false)
+			if (api_strpos($value, "|") !== false)
 			 {
 			 	$full_link_array=explode("|", $value);
 				$link=trim($full_link_array[0]);
@@ -604,7 +604,7 @@ return true;
 	//form
 	echo '<form name="form1" method="post" onsubmit="return CheckSend()" action="'.api_get_self().'?cidReq='.$_course[id].'&action=showpage&amp;title='.$page.'&group_id='.Security::remove_XSS($_GET['group_id']).'">';
 	echo '<div id="wikititle" style="min-height:30px;">';
-	echo  '<div style="width:70%;float:left;"><span class="form_required">*</span> '.get_lang(Title).': <input type="text" id="title" name="title" value="'.urldecode($_GET['title']).'" size="40"></div>';
+	echo  '<div style="width:70%;float:left;"><span class="form_required">*</span> '.get_lang(Title).': <input type="text" id="wiki_title" name="title" value="'.urldecode($_GET['title']).'" size="40"></div>';
 
 	if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{