Merge branch 'release_5-1' of https://github.com/ILIAS-eLearning/ILIAS …

…into release_5-1

Modules/Test/classes/class.ilTestArchiveService.php

@@ -39,9 +39,9 @@ public function __construct(ilObjTest $testOBJ)
 
 		$this->testOBJ = $testOBJ;
 		$this->participantData = null;
-
+		
 		$this->considerHiddenQuestionsEnabled = true;
-
+		
 		require_once 'Modules/Test/classes/class.ilTestResultHeaderLabelBuilder.php';
 		$this->testResultHeaderLabelBuilder = new ilTestResultHeaderLabelBuilder($lng, $ilObjDataCache);
 	}
@@ -61,12 +61,12 @@ public function setParticipantData(ilTestParticipantData $participantData)
 	{
 		$this->participantData = $participantData;
 	}
-
+	
 	public function isConsiderHiddenQuestionsEnabled()
 	{
 		return $this->considerHiddenQuestionsEnabled;
 	}
-
+	
 	public function setConsiderHiddenQuestionsEnabled($considerHiddenQuestionsEnabled)
 	{
 		$this->considerHiddenQuestionsEnabled = $considerHiddenQuestionsEnabled;
@@ -122,6 +122,7 @@ private function renderOverviewContent($activeId, $pass)
 	 */
 	private function buildOverviewFilename($activeId, $pass)
 	{
-		return ilUtil::getWebspaceDir().'/assessment/scores-'.$this->testOBJ->getId().'-'.$activeId.'-'.$pass.'.pdf';
+		$tmpFileName = ilUtil::ilTempnam();
+		return dirname($tmpFileName).'/scores-'.$this->testOBJ->getId().'-'.$activeId.'-'.$pass.'.pdf';
 	}
 }

Modules/Test/classes/class.ilTestArchiver.php

@@ -331,7 +331,8 @@ protected function hasTestArchive()
 	 */
 	protected function createArchiveForTest() 
 	{
-		mkdir( $this->getTestArchive(), 0777, true );
+		ilUtil::makeDirParents($this->getTestArchive());
+		//mkdir( $this->getTestArchive(), 0777, true );
 	}
 
 	/**
@@ -750,7 +751,6 @@ protected function determinePassDataPath($date, $active_fi, $pass, $user_firstna
 	protected function logArchivingProcess($message) 
 	{
 		$archive = $this->getTestArchive() . self::DIR_SEP . self::ARCHIVE_LOG;
-
 		if( file_exists($archive) )
 		{
 			$content = file_get_contents($archive). "\n" . $message;

Modules/Test/classes/class.ilTestEvaluation.php

@@ -11,7 +11,7 @@
 class ilTestEvaluation
 {
 	/**
-	 * @var ilDBInterface
+	 * @var ilDB
 	 */
 	protected $db;
 
@@ -21,9 +21,9 @@ class ilTestEvaluation
 	protected $testId;
 
 	/**
-	 * @param ilDBInterface $db
+	 * @param ilDB $db
 	 */
-	public function __construct(ilDBInterface $db, $testId)
+	public function __construct(ilDB $db, $testId)
 	{
 		$this->db = $db;
 		$this->testId = $testId;

Modules/Test/classes/class.ilTestPDFGenerator.php

@@ -68,6 +68,13 @@ private static function makeHtmlDocument($contentHtml, $styleHtml)
 			$node->parentNode->removeChild($node);
 		}
 
+		// remove noprint elems as tcpdf will make empty pdf when hidden by css rules
+		$domX = new DomXPath($dom);
+		foreach($domX->query("//*[contains(@class, 'ilNoDisplay')]") as $node)
+		{
+			$node->parentNode->removeChild($node);
+		}
+
 		$dom->encoding = 'UTF-8';
 		$cleaned_html = $dom->saveHTML();
 		if(!$cleaned_html)

Services/PDFGeneration/classes/class.ilTCPDFGenerator.php

@@ -46,6 +46,7 @@ public static function generatePDF(ilPDFGenerationJob $job)
 
 		foreach ($job->getPages() as $page)
 		{
+			$page = ' '.$page; // WTF !! otherwise empty page !! must investigate, 50x works with same content
 			$pdf->AddPage();
 			$pdf->writeHTML($page, true, false, true, false, '');			
 		}

docs/INSTALL

@@ -161,7 +161,7 @@ source files into separate directories in /opt/ilias/src:
 The ILIAS software, its documentation and the web space directory structure is
 stored in:
 
-    ilias-5.1.5.tar.gz
+    ilias-5.1.6.tar.gz
 
 The ILIAS tarball may also reside in /opt/ilias/src/tarballs/. After all third-
 party software has been installed it can directly be extracted into the web
@@ -512,7 +512,7 @@ components:
     First extract the content of the ILIAS tarball into the web space directory:
 
         cd /opt/ilias/www/htdocs/
-        tar -xzf /opt/ilias/src/tarballs/ilias-5.1.5.tar.gz
+        tar -xzf /opt/ilias/src/tarballs/ilias-5.1.6.tar.gz
 
     Please make sure your webserver has write permission to the ILIAS web space
     and data directories and all their subdirectories. If your webserver daemon
@@ -655,7 +655,7 @@ your choice). Do not simply overwrite the 'ilias' directory in your webspace!
 Example:
 
     cd /tmp
-    tar -xzf /opt/ilias/src/tarballs/ilias-5.1.5.tar.gz
+    tar -xzf /opt/ilias/src/tarballs/ilias-5.1.6.tar.gz
 
 After extracting the files you will find a newly created subdirectory 'ilias' in
 your tmp/ directory. Depending on the ILIAS version you are replacing you must

include/inc.ilias_version.php

@@ -9,6 +9,6 @@
 *
 * @package ilias-core
 */
-define("ILIAS_VERSION", "5.1.5 2016-04-15");
-define("ILIAS_VERSION_NUMERIC", "5.1.5");			// must be always x.y.z: x, y and z are numbers
+define("ILIAS_VERSION", "5.1.6 2016-05-19");
+define("ILIAS_VERSION_NUMERIC", "5.1.6");			// must be always x.y.z: x, y and z are numbers
 ?>

lang/ilias_ar.lang

@@ -16189,3 +16189,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable

lang/ilias_bg.lang

@@ -16189,3 +16189,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable

lang/ilias_cs.lang

@@ -16189,3 +16189,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable

lang/ilias_da.lang

@@ -16189,3 +16189,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable

lang/ilias_el.lang

@@ -16190,3 +16190,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable

lang/ilias_es.lang

@@ -16189,3 +16189,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable

lang/ilias_et.lang

@@ -16189,3 +16189,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable

lang/ilias_fa.lang

@@ -16189,3 +16189,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable

lang/ilias_fr.lang

@@ -16189,3 +16189,15 @@ crs#:#event_tbl_admins#:#Administrators###14 04 2016 new variable
 crs#:#event_tbl_members#:#Members###14 04 2016 new variable
 crs#:#event_tbl_tutors#:#Tutors###14 04 2016 new variable
 trac#:#trac_cron_info#:#Please activate the "Object Statistics" cron job to gather data.###20 04 2016 new variable
+assessment#:#ass_create_export_file_with_results#:#Create Test Export File (incl. Participant Results)###19 05 2016 new variable
+assessment#:#tst_conflict_fbh_oblig_quest#:#The combination of using compulsory questions and locked answers is not allowed.###19 05 2016 new variable
+assessment#:#tst_conflict_reset_non_fbh#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers".###19 05 2016 new variable
+assessment#:#tst_conflict_reset_fbh_force#:#The setting "Lock Answers" was adjusted to "Do Not Lock Answers but Force Feedback".###19 05 2016 new variable
+dcl#:#dcl_reference_link_info#:#Detailed View must be active in referenced table###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_linked#:#Already accepted the contact request from user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_requested#:#Already requested user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_ignored#:#Already ignored user '%s'.###19 05 2016 new variable
+buddysystem#:#buddy_bs_action_already_unlinked#:#The contact state for user '%s' is already unlinked.###19 05 2016 new variable
+sess#:#sess_list_reg_limit_places#:#Free places###19 05 2016 new variable
+sess#:#sess_accept_request#:#Accept Participation###19 05 2016 new variable
+sess#:#sess_new_registrations#:#Join Request###19 05 2016 new variable