not only log sophisticated upload errors into log table, also tell the user what went wrong with the upload as per codeigniter 3 upload class;

application/config/lrt.php

@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Configs for the Long Run Tasks
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-// Maximum LRTs for a single user in parallel
-$config['lrt_max_number_single_user'] = 10;
-
-// Maximum LRTs for the whole system in parallel
-$config['lrt_max_number_system'] = 100;
-
-// Maximum running time in hours for a single LRT before killing it
-$config['lrt_max_run_timeout'] = 24;
-
-// List of existing LRT types
-$config['lrt_types'] = array('LRTDummy');
-

application/controllers/Cis/Compat.php

@@ -1,44 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Compat extends Auth_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-
-	public function __construct()
-	{
-		parent::__construct([
-			'ci' => ['basis/cis:r'],
-			'legacy' => ['basis/cis:r'],
-			
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-	/**
-	 * @access public
-	 * @return void 
-	 */
-	public function ci()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
-	}
-
-	/**
-	 * @access public
-	 * @return void
-	 */
-	public function legacy()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
-	}
-
-}

application/controllers/api/frontend/v1/CisMenu.php

@@ -67,11 +67,8 @@ class CisMenu extends FHCAPI_Controller
 
 	private function generateUrlForMenuItem($menuItem)
 	{
-		if(!isset($menuItem->url))
-		{
-			$menuItem->url = $this->menuItemUrlHelper($menuItem);
-			unset($menuItem->content);
-		}
+		$menuItem->url = $this->menuItemUrlHelper($menuItem);
+		unset($menuItem->content);
 
 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -86,7 +83,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}
 
-		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}
 

application/controllers/components/LRT.php

@@ -1,38 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * 
- */
-class LRT extends Auth_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'getRunningLRTs' => self::PERM_LOGGED,
-			)
-		);
-
-		// Loads libraries
-		$this->load->library('LongRunTaskLib');
-	}
-
-	/**
-	 *
-	 */
-	public function getRunningLRTs()
-	{
-		$runningLrtsResult = $this->longruntasklib->getRunningLRTsUser(getAuthUID());
-
-		if (isError($runningLrtsResult)) $this->terminateWithJsonError($runningLrtsResult);
-
-		$this->outputJson($runningLrtsResult);
-	}
-}
-

application/controllers/jobs/LongRunTaskExecJob.php

@@ -1,112 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-/**
- * - This controller acts as interface of the LongRunTaskLib that contains
- * all the needed functionalities to operate with the Long Run Task system
- * that is built on top of the Jobs Queue System
- * - This is a Job Queue Worker that gets scheduled LRTs from the queue and executes them
- * - Once all the LRTs have been started checks if there are LRTs that are running for too long and kills them
- */
-class LongRunTaskExecJob extends JOB_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Changes the needed configs for LogLib
-		$this->LogLibJob->setConfigs(
-			array(
-				'dbExecuteUser' => get_class($this),
-				'requestId' => 'LRT'
-			)
-		);
-
-		// Loads LongRunTaskLib library
-		$this->load->library('LongRunTaskLib');
-	}
-
-	/**
-	 * Executes all the new LRTs
-	 */
-	public function execEmAll()
-	{
-		$this->logInfo('Execute long run tasks started');
-
-		// Get all the LRTs that is possible to execute now
-		$lrtsResult = $this->longruntasklib->getNewLRTs();
-		// If an error occurred then return it
-		if (isError($lrtsResult)) return $lrtsResult;
-
-		if (hasData($lrtsResult))
-		{
-			// For each LRT
-			foreach (getData($lrtsResult) as $lrt)
-			{
-				// Execute the task
-				$executeLrtResult = $this->longruntasklib->executeLrt($lrt);
-				if (isError($executeLrtResult)) $this->logError($executeLrtResult);
-			}
-		}
-
-		$this->logInfo('Execute long run tasks ended');
-	}
-
-	/**
-	 * Kills all the hanging LRTs
-	 */
-	public function killHangingLRTs()
-	{
-		$this->logInfo('Kill hanging LRTs started');
-
-		// Get all the LRTs that is possible to execute now
-		$lrtsResult = $this->longruntasklib->getHangingLRTs();
-		// If an error occurred then return it
-		if (isError($lrtsResult)) return $lrtsResult;
-
-		if (hasData($lrtsResult))
-		{
-			// For each LRT
-			foreach (getData($lrtsResult) as $lrt)
-			{
-				// Kill the task
-				$killLrtResult = $this->longruntasklib->killLrt($lrt);
-				if (isError($killLrtResult)) $this->logError($killLrtResult);
-			}
-		}
-
-		$this->logInfo('Kill hanging LRTs ended');
-	}
-
-	/**
-	 * 
-	 */
-	public function checkExecution()
-	{
-		$this->logInfo('Check execution long run tasks started');
-
-		// Get the related LRT data from the queue
-		$lrtsResult = $this->longruntasklib->getRunningLRTs();
-		// If an error occurred then return it
-		if (isError($lrtsResult)) return $lrtsResult;
-
-		// If there are running LRTs
-		if (hasData($lrtsResult))
-		{
-			// For each LRT
-			foreach (getData($lrtsResult) as $lrt)
-			{
-				// Check the LRT execution
-				$checkExecutionResult = $this->longruntasklib->checkExecution($lrt);
-				if (isError($checkExecutionResult)) $this->logError($checkExecutionResult);
-			}
-		}
-
-		$this->logInfo('Check execution long run tasks ended');
-	}
-}
-

application/controllers/lrts/LRTDummy.php

@@ -1,82 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-/**
- * Testing LRT to check if the LRT system is working properly
- * This will be called by the LongRunTaskExecJob
- */
-class LRTDummy extends LRT_Controller
-{
-	/**
-	 *
-	 */
-	public function run($jobid)
-	{
-		$this->logInfo('Long run tasks '.get_class($this).' started');
-
-		$this->_doIt($jobid);
-
-		$this->logInfo('Long run tasks '.get_class($this).' ended');
-	}
-
-	/**
-	 * Loops on the number of seconds provided by the LRT input
-	 * Sleeps every time 1 sec
-	 * Writes the progress
-	 * Writes the output
-	 */
-	private function _doIt($jobid)
-	{
-		// Get the LRT record related to the provided jobid
-		$lrtResult = $this->getLrt($jobid);
-
-		// If an error occurred or the record has not been found
-		if (isError($lrtResult))
-		{
-			$this->logError($lrtResult);
-			return;
-		}
-		if (!hasData($lrtResult))
-		{
-			$this->logError('LRT not found in database');
-			return;
-		}
-		
-		// Get the record
-		$lrt = getData($lrtResult)[0];
-
-		// Get and check the input
-		$input = json_decode($lrt->{LongRunTaskLib::PROPERTY_INPUT});
-		if ($input == null)
-		{
-			$this->logError('LRT input is not a valid json');
-			return;
-		}
-
-		// Operation
-		for ($i = 0; $i < (int)$input->sleep; $i++)
-		{
-			sleep(1);
-			// Set the progress
-			$setProgressResult = $this->setProgress($jobid, (($i + 1) / (int)$input->sleep) * 100);
-			if (isError($setProgressResult))
-			{
-				$this->logError($setProgressResult);
-				return;
-			}
-		}
-
-		$sleepMsg = 'The user '.$lrt->{LongRunTaskLib::PROPERTY_UID}.' slept for '.$input->sleep.' seconds';
-
-		$this->logInfo($sleepMsg);
-
-		// Set the output
-		$setOutputResult = $this->setOutput($jobid, $sleepMsg);
-		if (isError($setOutputResult))
-		{
-			$this->logError($setOutputResult);
-		}
-	}
-}
-

application/controllers/system/LRTTest.php

@@ -1,56 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use \stdClass as stdClass;
-
-/**
- * 
- */
-class LRTTest extends Auth_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => 'system/developer:r',
-				'lrt1min' => 'system/developer:r',
-			)
-		);
-
-		// Loads LongRunTaskLib library
-		$this->load->library('LongRunTaskLib');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function index()
-	{
-		$this->load->view('system/lrtTest.php');
-	}
-
-	/**
-	 *
-	 */
-	public function lrt1min()
-	{
-		$lrtInput = new stdClass();
-		$lrtInput->sleep = 1; // Sleep for 1 min
-
-		$this->outputJsonSuccess(
-			$this->longruntasklib->addNewLrtToQueue(
-				'LRTDummy', // LRT type
-				getAuthUID(), // UID executer
-				$lrtInput // LRT input
-			)
-		);
-	}
-}
-

application/core/LRT_Controller.php

@@ -1,69 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-/**
- * Long Run Task
- *
- * - This controller acts as interface of the LongRunTaskLib that contains
- * all the needed functionalities to operate with the Long Run Task system
- * that is built on top of the Jobs Queue System
- * - This is an abstract class that provide basic functionalities,
- * it has to be extended to broaden its logic
- * - Any implementation of a Long Run Task should extends this class to
- * properly operate with the LRT system
- */
-abstract class LRT_Controller extends JOB_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Changes the needed configs for LogLib
-		$this->LogLibJob->setConfigs(
-			array(
-				'dbExecuteUser' => get_class($this),
-				'requestId' => 'LRT'
-			)
-		);
-
-		// Loads LongRunTaskLib library
-		$this->load->library('LongRunTaskLib');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	abstract public function run($jobid);
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Protected methods
-
-	/**
-	 *
-	 */
-	protected function getLrt($jobid)
-	{
-		return $this->longruntasklib->getLrt($jobid);
-	}
-
-	/**
-	 * 
-	 */
-	protected function setProgress($jobid, $progress)
-	{
-		return $this->longruntasklib->setProgress($jobid, $progress);
-	}
-
-	/**
-	 * 
-	 */
-	protected function setOutput($jobid, $output)
-	{
-		return $this->longruntasklib->setOutuput($jobid, $output);
-	}
-}
-

application/libraries/JobsQueueLib.php

@@ -2,8 +2,6 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-use \stdClass as stdClass;
-
 /**
  * Library that contains all the needed functionalities to operate with the Jobs Queue System
  */
@@ -26,12 +24,12 @@ class JobsQueueLib
 	const PROPERTY_END_TIME = 'endtime';
 	const PROPERTY_ERROR = 'error';
 
-	protected $_ci; // CI instance
+	private $_ci; // CI instance
 
 	/**
 	 * Constructor
 	 */
-	public function __construct()
+	public function __construct($authenticate = true)
 	{
 		// Gets CI instance
 		$this->_ci =& get_instance();
@@ -64,29 +62,14 @@ class JobsQueueLib
 	 */
 	public function getOldestJobs($type, $maxAmount = null)
 	{
-		$types = $type; // default is array
-		$limit = 0; // default query limit
+		$this->_ci->JobsQueueModel->resetQuery();
+
+		$this->_ci->JobsQueueModel->addOrder('creationtime', 'ASC');
 
 		// If the maximum amount of jobs to retrieve have been specified
-		if (is_numeric($maxAmount)) $limit = $maxAmount;
+		if (is_numeric($maxAmount)) $this->_ci->JobsQueueModel->addLimit($maxAmount);
 
-		// If it is a string then include it into an array
-		if (!isEmptyString($type) && is_string($type)) $types = array($type);
-
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-			  FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-		      ORDER BY jq.creationtime DESC
-			 LIMIT ?',
-			array(
-				$types,
-				self::STATUS_NEW,
-				$limit
-			)
-		);
+		return $this->_ci->JobsQueueModel->loadWhere(array('status' => self::STATUS_NEW, 'type' => $type));
 	}
 
 	/**
@@ -94,23 +77,11 @@ class JobsQueueLib
 	 */
 	public function getJobsByTypeStatus($type, $status)
 	{
-		$types = $type; // default is array
+		$this->_ci->JobsQueueModel->resetQuery();
 
-		// If it is a string then include it into an array
-		if (!isEmptyString($type) && is_string($type)) $types = array($type);
+		$this->_ci->JobsQueueModel->addOrder('creationtime', 'DESC');
 
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-			  FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-		      ORDER BY jq.creationtime DESC',
-			array(
-				$types,
-				$status
-			)
-		);
+		return $this->_ci->JobsQueueModel->loadWhere(array('status' => $status, 'type' => $type));
 	}
 
 	/**
@@ -282,30 +253,8 @@ class JobsQueueLib
 		return array($job);
 	}
 
-	//------------------------------------------------------------------------------------------------------------------
-	// Protected methods
-
-	/**
-	 * Checks if the given job contains a valid type
-	 */
-	protected function _checkJobType($type, $types)
-	{
-		return $this->_inArray($type, $types, self::PROPERTY_TYPE);
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
-	
-	/**
-	 * Drop not allowed properties from the given job
-	 */
-	private function _dropNotAllowedPropertiesNewJob(&$job)
-	{
-		unset($job->{self::PROPERTY_JOBID});
-		unset($job->{self::PROPERTY_CREATIONTIME});
-		unset($job->{self::PROPERTY_TYPE});
-	}
-
 
 	/**
 	 * Checks the job object structure when needed for insert
@@ -332,6 +281,34 @@ class JobsQueueLib
 		return false; // better sorry than wrong
 	}
 
+	/**
+	 * Checks the job object structure when needed for update
+	 */
+	private function _checkUpdateJobStructure(&$job)
+	{
+		// If job is a valid object
+		if (is_object($job) && property_exists($job, self::PROPERTY_JOBID)) return true; // it is valid!
+
+		// If not object then object it!
+		if (!is_object($job)) $job = new stdClass();
+
+		// If an error property was not already previously stored then store an error message in job object
+		if (!property_exists($job, self::PROPERTY_ERROR))
+		{
+			$job->{self::PROPERTY_ERROR} = 'The structure of the provided job is not valid';
+		}
+
+		return false; // better sorry than wrong
+	}
+
+	/**
+	 * Checks if the given job contains a valid type
+	 */
+	private function _checkJobType($type, $types)
+	{
+		return $this->_inArray($type, $types, self::PROPERTY_TYPE);
+	}
+
 	/**
 	 * Checks if the given job contains a valid status
 	 */
@@ -356,26 +333,6 @@ class JobsQueueLib
 		return $found;
 	}
 
-	/**
-	 * Checks the job object structure when needed for update
-	 */
-	private function _checkUpdateJobStructure(&$job)
-	{
-		// If job is a valid object
-		if (is_object($job) && property_exists($job, self::PROPERTY_JOBID)) return true; // it is valid!
-
-		// If not object then object it!
-		if (!is_object($job)) $job = new stdClass();
-
-		// If an error property was not already previously stored then store an error message in job object
-		if (!property_exists($job, self::PROPERTY_ERROR))
-		{
-			$job->{self::PROPERTY_ERROR} = 'The structure of the provided job is not valid';
-		}
-
-		return false; // better sorry than wrong
-	}
-
 	/**
 	 * Search in an array the given value
 	 * The elements of the given array are objects
@@ -397,6 +354,16 @@ class JobsQueueLib
 		return $found;
 	}
 
+	/**
+	 * Drop not allowed properties from the given job
+	 */
+	private function _dropNotAllowedPropertiesNewJob(&$job)
+	{
+		unset($job->{self::PROPERTY_JOBID});
+		unset($job->{self::PROPERTY_CREATIONTIME});
+		unset($job->{self::PROPERTY_TYPE});
+	}
+
 	/**
 	 * Drop not allowed properties from the given job
 	 */

application/libraries/LongRunTaskLib.php

@@ -1,354 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once 'JobsQueueLib.php';
-
-/**
- * Library that contains all the needed functionalities to operate with the Long Run Tasks
- */
-class LongRunTaskLib extends JobsQueueLib
-{
-	// Config names
-	const CFG_LRT_MAX_NUMBER_SYSTEM = 'lrt_max_number_system';
-	const CFG_LRT_TYPES = 'lrt_types';
-	const CFG_LRT_MAX_RUN = 'lrt_max_run_timeout';
-	const CFG_LRT_MAX_NUMBER_USER = 'lrt_max_number_single_user';
-
-	// LRT object properties
-	const PROPERTY_UID = 'uid';
-	const PROPERTY_PID = 'pid';
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Loads the Long Run Tasks configs
-		$this->_ci->config->load('lrt');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods used by the LongRunTaskExecJob
-
-	/**
-	 * Get the oldest added LRTs to the queue having status = new
-	 * The maximum number of returned queued LRTs is limited by:
-	 * number of currently running LRTs - maximum allowed number of LRTs for the system
-	 */
-	public function getNewLRTs()
-	{
-		// Get all the running LRTs
-		$runningLrtsResult = $this->getJobsByTypeStatus($this->_ci->config->item(self::CFG_LRT_TYPES), JobsQueueLib::STATUS_RUNNING);
-
-		if (isError($runningLrtsResult)) return $runningLrtsResult;
-
-		// The number of the currently running LRTs - the maximum LRTs for the system
-		$max_number_of_lrts = $this->_ci->config->item(self::CFG_LRT_MAX_NUMBER_SYSTEM) - count(getData($runningLrtsResult));
-
-		// Get the oldest LRTs added to the queue
-		return $this->getOldestJobs($this->_ci->config->item(self::CFG_LRT_TYPES), $max_number_of_lrts);
-	}
-
-	/**
-	 * Get all the LRT that are running more then CFG_LRT_MAX_RUN hours
-	 */
-	public function getHangingLRTs()
-	{
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-		          FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-			   AND jq.starttime < NOW() - INTERVAL \''.$this->_ci->config->item(self::CFG_LRT_MAX_RUN).' hours\'
-		      ORDER BY jq.creationtime DESC',
-			array(
-				$this->_ci->config->item(self::CFG_LRT_TYPES),
-				JobsQueueLib::STATUS_RUNNING
-			)
-		);
-	}
-
-	/**
-	 * Get all the LRT that are currently running
-	 */
-	public function getRunningLRTs()
-	{
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-		          FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-		      ORDER BY jq.creationtime DESC',
-			array(
-				$this->_ci->config->item(self::CFG_LRT_TYPES),
-				JobsQueueLib::STATUS_RUNNING
-			)
-		);
-	}
-
-	/**
-	 * Execute a LRT in background
-	 * - Checks if the wanted LRT exists in the applcation/controllers/lrts directory
-	 * - Then executes it in background via CI CLI
-	 * - Stores the LRT pid into the database
-	 */
-	public function executeLrt($lrt)
-	{
-		$output = array();
-
-		// If does _not_ exist a LRT implementation for this LRT type, then return an error
-		if (!file_exists(APPPATH.'controllers/lrts/'.$lrt->{self::PROPERTY_TYPE}.'.php'))
-		{
-			return error('The required LRT implementation has not been found');
-		}
-
-		// Execute the LRT implementation (a CI controller from CLI) providing as parameter the jobid
-		exec(
-			// Command
-			sprintf(
-				'/usr/bin/php %s/../index.ci.php lrts/%s/run %s > /dev/null 2>&1 & echo $!',
-				APPPATH,
-				$lrt->{self::PROPERTY_TYPE},
-				$lrt->{self::PROPERTY_JOBID}
-			),
-			$output // Here goes the output from the standard output and error
-		);
-
-		// If a pid has not been returned
-		if (isEmptyArray($output) || !is_numeric($output[0])) return error('Not a valid pid has been returned');
-
-		// Set the pid, status and starttime of this LRT into the database
-		$updateLrtResult = $this->_ci->JobsQueueModel->update(
-			$lrt->{self::PROPERTY_JOBID},
-			array(
-				'pid' => $output[0],
-				'starttime' => 'NOW()',
-				'status' => self::STATUS_RUNNING
-			)
-		);
-		if (isError($updateLrtResult)) return $updateLrtResult;
-	}
-
-	/**
-	 * Kill the provided LRT
-	 * To avoid to kill a process that is not this LRT,
-	 * since the same PID can be assigned to another process once this ended
-	 */
-	public function killLrt($lrt)
-	{
-		// Try to get the pid of this LRT from the system
-		$pid = exec(
-			sprintf(
-				'ps -eo pid,cmd | grep "index.ci.php lrts/%s/run %s" | grep -v grep | awk \'{print $1}\'',
-				$lrt->{self::PROPERTY_TYPE},
-				$lrt->{self::PROPERTY_JOBID}
-			)
-		);
-
-		// If the pid is the same then kill the process with a SIGKILL
-		if ($pid == $lrt->{self::PROPERTY_PID}) exec('kill -9 '.$lrt->{self::PROPERTY_PID}.' > /dev/null 2>&1');
-
-		// Set the LRT as failed in any case
-		$lrtExecFailedResult = $this->_ci->JobsQueueModel->update(
-			$lrt->{self::PROPERTY_JOBID},
-			array(
-				'endtime' => 'NOW()',
-				'status' => self::STATUS_FAILED
-			)
-		);
-		// If an error occurred then return it
-		if (isError($lrtExecFailedResult)) return $lrtExecFailedResult;
-	}
-
-	/**
-	 *
-	 */
-	public function checkExecution($lrt)
-	{
-		// If the LRT stopped running
-		if (!$this->_isRunning($lrt))
-		{
-			// Loads MessageLib library
-			$this->_ci->load->library('MessageLib');
-			// Load the BenutzerModel
-			$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-
-			// Get the benutzer for this uid
-			$benutzerResult = $this->_ci->BenutzerModel->loadWhere(array('uid' => $lrt->{LongRunTaskLib::PROPERTY_UID}));
-			// If an error occurred then return it
-			if (isError($benutzerResult)) return $benutzerResult;
-			// If no benutzer has been found
-			if (!hasData($benutzerResult)) return error('No benutzer found, uid: '.$lrt->{LongRunTaskLib::PROPERTY_UID});
-
-			$benutzer = getData($benutzerResult)[0];
-
-			// Sends a message to the user
-			$messageResult = $this->_ci->messagelib->sendMessageUser(
-			        $benutzer->person_id,
-			        'Long run task ended',
-			        'The long run task '.$lrt->{self::PROPERTY_TYPE}.' ended, output: '.$lrt->{self::PROPERTY_OUTPUT}
-			);
-			// If an error occurred then return it
-			if (isError($messageResult)) return $messageResult;
-
-			// Set the LRT as done
-			$lrtExecOverResult = $this->_ci->JobsQueueModel->update(
-				$lrt->{self::PROPERTY_JOBID},
-				array(
-					'endtime' => 'NOW()',
-					'status' => self::STATUS_DONE
-				)
-			);
-			// If an error occurred then return it
-			if (isError($lrtExecOverResult)) return $lrtExecOverResult;
-		}
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods used by the front end applications (standard controllers/end points, ex. controllers/system/LRTTest.php)
-
-	/**
-	 * Add a single LRT to the queue
-	 */
-	public function addNewLrtToQueue($type, $uid, $lrtInput)
-	{
-		// Checks parameters
-		if (isEmptyString($type)) return error('The provided type parameter is not a valid string');
-		if (isEmptyString($uid)) return error('The provided uid parameter is not a valid string');
-
-		// Get all the running task for this uid
-		// Return the result of the query
-                $runningLRTbyUIDResult = $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-			  FROM system.tbl_jobsqueue jq
-			 WHERE jq.status IN ?
-			   AND jq.uid = ?
-			',
-			array(
-				array(
-					self::STATUS_NEW,
-					self::STATUS_RUNNING
-				),
-				$uid
-			)
-                );
-
-		// If an error occurred then return it
-		if (isError($runningLRTbyUIDResult)) return $runningLRTbyUIDResult;
-
-		// If the running tasks for this user are too many
-		if (count(getData($runningLRTbyUIDResult)) >= $this->_ci->config->item(self::CFG_LRT_MAX_NUMBER_USER))
-		{
-			return error('Too many running tasks for this user');
-		}
-
-		// Convert input to JSON and check it
-		$jsonLrtInput = json_encode($lrtInput);
-		if ($jsonLrtInput == null) return error('The provided LRT input is not valid');
-
-		// Get all the job types
-		$dbResult = $this->_ci->JobTypesModel->load();
-		if (isError($dbResult)) return $dbResult;
-		$types = getData($dbResult);
-
-		// If the given type is not present in database
-		if (!$this->_checkJobType($type, $types)) return error('The provided type parameter is not valid');
-
-		// Get all the job statuses
-		$dbResult = $this->_ci->JobStatusesModel->load();
-		if (isError($dbResult)) return $dbResult;
-		$statuses = getData($dbResult);
-
-		// Create an object that represent the new tbl_jobsqueue record with the provided input
-		$lrt = $this->generateJobs(self::STATUS_NEW, $jsonLrtInput)[0];
-
-		// What you asked is what you get!
-		$lrt->{self::PROPERTY_TYPE} = $type;
-		$lrt->{self::PROPERTY_UID} = $uid;
-
-		// Try to insert the single lrt into database
-		$dbNewLrtResult = $this->_ci->JobsQueueModel->insert($lrt);
-
-		// If an error occurred during while inserting in database
-		if (isError($dbNewLrtResult)) return $dbNewLrtResult;
-
-		return success('LRT added to the queue');
-	}
-
-	/**
-	 * Get all the LRT that are currently running for the given user
-	 */
-	public function getRunningLRTsUser($uid)
-	{
-		// Return the result of the query
-		return $this->_ci->JobsQueueModel->execReadOnlyQuery('
-			SELECT jq.*
-		          FROM system.tbl_jobsqueue jq
-			 WHERE jq.type IN ?
-			   AND jq.status = ?
-			   AND jq.uid = ?
-		      ORDER BY jq.creationtime DESC',
-			array(
-				$this->_ci->config->item(self::CFG_LRT_TYPES),
-				JobsQueueLib::STATUS_RUNNING,
-				$uid
-			)
-		);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods used by the LRT implementation (controllers/ltrs/*, ex. controllers/ltrs/LRTDummy)
-
-	/**
-	 * Return a single record from the 
-	 */
-	public function getLrt($jobid)
-	{
-		$this->_ci->JobsQueueModel->resetQuery();
-
-		return $this->_ci->JobsQueueModel->loadWhere(array('jobid' => $jobid));
-	}
-
-	/**
-	 * 
-	 */
-	public function setProgress($jobid, $progress)
-	{
-		return $this->_ci->JobsQueueModel->update($jobid, array('progress' => $progress));
-	}
-
-	/**
-	 * 
-	 */
-	public function setOutuput($jobid, $output)
-	{
-		return $this->_ci->JobsQueueModel->update($jobid, array('output' => json_encode($output)));
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Return true if the LRT is still running
-	 */
-	private function _isRunning($lrt)
-	{
-		// Try to get the pid of this LRT from the system
-		$pid = exec(
-			sprintf(
-				'ps -eo pid,cmd | grep "index.ci.php lrts/%s/run %s" | grep -v grep | awk \'{print $1}\'',
-				$lrt->{self::PROPERTY_TYPE},
-				$lrt->{self::PROPERTY_JOBID}
-			)
-		);
-
-		// If the pid is the same then the LRT is still running
-		return $pid == $lrt->{self::PROPERTY_PID};
-	}
-}
-

application/views/system/lrtTest.php

@@ -1,28 +0,0 @@
-<?php
-	$includesArray = array(
-		'title' => 'LRT Test Page',
-		'axios027' => true,
-		'bootstrap5' => true,
-		'fontawesome6' => true,
-		'vue3' => true,
-		'navigationcomponent' => true,
-		'phrases' => array(
-			'global',
-			'ui'
-		),
-		'customJSModules' => array('public/js/apps/LRTTest.js'),
-	);
-
-	$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-	<div id="main">
-
-		<!-- Navigation component -->
-		<core-navigation-cmpt></core-navigation-cmpt>
-
-		<div id="content"></div>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-

cis/testtool/login.php

@@ -632,7 +632,6 @@ elseif (isset($prestudent_id))
 
 				$ps_obj->lastStatus = $ps_tmp->status_kurzbz; // letzten Status dem result array hinzufügen
 				$ps_obj->status_mehrsprachig = $ps_tmp->status_mehrsprachig;
-				$ps_obj->ausbildungssemester = $ps_tmp->ausbildungssemester;
 			}
 
 			// Falls Status 'Abgewiesene' vorhanden, nach hinten reihen

cis/testtool/menu.php

@@ -29,7 +29,6 @@ require_once('../../include/sprache.class.php');
 require_once '../../include/phrasen.class.php';
 require_once '../../include/studiengang.class.php';
 require_once('../../include/gebiet.class.php');
-require_once('../../include/gebiet_pruefling.class.php');
 
 if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
@@ -199,8 +198,8 @@ else if (isset($_SESSION['pruefling_id']))
 		)
 
 
-		SELECT * FROM (SELECT DISTINCT ON
-			(gebiet_id)
+		SELECT DISTINCT ON
+			(gebiet_id, semester, reihung)
 			semester,
 			gebiet_id,
 			STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
@@ -227,7 +226,13 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					tbl_ablauf.semester <= prestudent_data.semester
+					(
+						(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
+						OR
+						(prestudent_data.semester= 2 AND tbl_ablauf.semester = 2)
+						OR
+						(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
+					)
 				AND (   
 						prestudent_data.studienplan_id = tbl_ablauf.studienplan_id
 						OR
@@ -254,7 +259,9 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					tbl_ablauf.semester <= prestudent_data.semester
+					(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
+				OR
+					(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
 				)
 			) temp
 		) temp2
@@ -263,7 +270,7 @@ else if (isset($_SESSION['pruefling_id']))
 			semester,
 			 gebiet_id,
 			 bezeichnung,
-			". $bezeichnung_mehrsprachig_sel ." ) temp3
+			". $bezeichnung_mehrsprachig_sel ." 
 
 		ORDER BY
 			semester,
@@ -276,8 +283,6 @@ else if (isset($_SESSION['pruefling_id']))
 	$lastsemester = '';
 	$quereinsteiger_stg = '';
 	$_SESSION['alleGebiete']= [];
-	$gebiet_pruefling = new gebiet_pruefling();
-	$quereinsteiger_menu = false;
 	while($row = $db->db_fetch_object($result))
 	{
 		//Jedes Semester in einer eigenen Tabelle anzeigen
@@ -289,25 +294,8 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			if ($row->semester == '1')
-			{
-				// Basisgebiete anzeigen
-				echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-				echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/basisgebiete') . '</td></tr>';
-			}
-			else
-			{
-				if (!$quereinsteiger_menu)
-				{
-					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-					echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/quereinstiegsgebiete') . '</td></tr>';
-					$quereinsteiger_menu = true;
-				}
-				else
-				{
-					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-				}
-			}
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 
 		// Bei Quereinstiegsgebieten nach STG clustern und die STG anzeigen
@@ -406,12 +394,6 @@ else if (isset($_SESSION['pruefling_id']))
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
-			if (!$gebiet_pruefling->checkIfExists($_SESSION['pruefling_id'], $row->gebiet_id))
-			{
-				$gebiet_pruefling->pruefling_id = $_SESSION['pruefling_id'];
-				$gebiet_pruefling->gebiet_id = $row->gebiet_id;
-				$gebiet_pruefling->saveGebietForPruefling();
-			}
 			$_SESSION['alleGebiete'][] = $row->gebiet_id;
 		}
 		else

include/gebiet_pruefling.class.php

@@ -1,97 +0,0 @@
-<?php
-/* Copyright (C) 2024 Technikum-Wien
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-require_once(dirname(__FILE__).'/basis_db.class.php');
-
-class gebiet_pruefling extends basis_db
-{
-	//Tabellenspalten
-	public $prueflinggebiet_id;
-	public $pruefling_id;
-	public $gebiet_id;
-	public $insertamum;
-
-
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	public function loadByPruefling($pruefling_id)
-	{
-		$qry = "SELECT *
-     			FROM testtool.tbl_pruefling_gebiet
-     			WHERE pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER);
-
-		if($this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object())
-			{
-				$this->prueflinggebiet_id = $row->prueflinggebiet_id;
-				$this->pruefling_id = $row->pruefling_id;
-				$this->gebiet_id = $row->gebiet_id;
-				return true;
-			}
-			else
-			{
-				$this->errormsg = "Pruefling nicht gefunden";
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = "Fehler beim Laden der Gebiete für den Pruefling";
-			return false;
-		}
-	}
-
-	public function checkIfExists($pruefling_id, $gebiet_id)
-	{
-		$qry = "SELECT 1 
-				FROM testtool.tbl_pruefling_gebiet 
-				WHERE pruefling_id =".$this->db_add_param($pruefling_id, FHC_INTEGER) ." AND gebiet_id =".$this->db_add_param($gebiet_id, FHC_INTEGER);
-
-		if ($result = $this->db_query($qry))
-		{
-			if ($this->db_num_rows($result) > 0)
-				return true;
-			else
-				return false;
-		}
-	}
-
-	public function saveGebietForPruefling()
-	{
-		$qry = "INSERT INTO testtool.tbl_pruefling_gebiet 
-    					(pruefling_id, gebiet_id)
-				VALUES(".
-			$this->db_add_param($this->pruefling_id, FHC_INTEGER).','.
-			$this->db_add_param($this->gebiet_id, FHC_INTEGER).');';
-
-		if ($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Daten';
-			return true;
-		}
-	}
-
-}
-?>

public/js/api/LRTTEst.js

@@ -1,9 +0,0 @@
-export default {
-	addNew1MinLrt()
-	{
-		return {
-			method: 'post',
-			url: '/system/LRTTest/lrt1min'
-		};
-	},
-}

public/js/api/lrt.js

@@ -1,25 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-export default {
-	load() {
-		return {
-			method: 'get',
-			url: '/components/LRT/getRunningLRTs'
-		};
-	}
-};

public/js/apps/Cis/Cis.js

@@ -19,7 +19,6 @@ import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.j
 import Studium from "../../components/Cis/Studium/Studium.js";
 import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
 import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
-import Compat from "../../components/Cis/Compat.js";
 
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
@@ -30,18 +29,6 @@ const isMobile = window.matchMedia("(max-width: 767px)").matches;
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
 	routes: [
-		{
-			path: `/Cis/Compat/:mode(ci|legacy)/:path(.*)`,
-			name: 'Compat',
-			component: Compat,
-			props: (route) => {
-				return {
-					mode: route.params.mode,
-					path: route.params.path,
-					query_string: VueRouter.stringifyQuery(route.query)
-				};
-			}
-		},
 		{
 			path: `/Cis/Studium`,
 			name: 'Studium',
@@ -290,7 +277,7 @@ const app = Vue.createApp({
 			if (target && this.isInternalRoute(target.href)) {
 				const url = new URL(target.href)
 				
-				const path = url.pathname + url.search;
+				const path = url.pathname
 				const base = this.$router.options.history.base
 				const route = path.replace(base, '') || '/'
 

public/js/apps/LRTTest.js

@@ -1,48 +0,0 @@
-/**
- * Copyright (C) 2022 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import PluginsPhrasen from '../plugins/Phrasen.js';
-import {CoreNavigationCmpt} from '../components/navigation/Navigation.js'
-
-import ApiLrt from "../api/LRTTEst.js";
-
-const lrtTestApp = Vue.createApp({
-	data: function() {
-		return {
-		};
-	},
-	components: {
-		CoreNavigationCmpt,
-	},
-	methods: {
-		addNew1MinLrt() {
-			this.$api.call(ApiLrt.addNew1MinLrt())
-			.then(result => {
-				this.dropdowns.studiensemester_array = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	template: `
-		<button type="button" class="btn btn-primary" @click="addNew1MinLrt()">Add a 1 min LRT</button>
-	`
-});
-
-FhcApps.makeExtendable(lrtTestApp);
-
-lrtTestApp.use(PluginsPhrasen).mount('#main');
-

public/js/components/Cis/Compat.js

@@ -1,93 +0,0 @@
-export default {
-	name: "Compat",
-	props: {
-		mode: { type: String, required: true },
-		path: { type: String, required: true },
-		query_string: { type: String, required: true, default: ''}
-	},
-	data: function() {
-		return {
-			lastLoadediFrameURL: '',
-			srcUrl: ''
-		};
-	},
-	computed: {
-		propsWatchHelper: function() {
-			return this.mode + '#' + this.path + '#' + this.query_string;
-		}
-	},
-	mounted: function() {
-		this.srcUrl = this.buildSrcUrl();
-	},
-	watch: {
-		propsWatchHelper: function() {
-			if(this.lastLoadediFrameURL === '') {
-				return;
-			}
-
-			let currentiFrameURL = this.$refs.compatiframe ? this.$refs.compatiframe.src : '';
-
-			let url = this.buildSrcUrl();
-			if(this.lastLoadediFrameURL !== url) {
-				this.srcUrl = url;
-				if(this.srcUrl === url) {
-					this.$refs.compatiframe.contentWindow.location.href = url;
-				}
-			}
-		}
-	},
-	methods: {
-		buildSrcUrl: function() {
-			let url = false;
-			switch(this.mode) {
-				case 'ci':
-					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/' + this.path;
-					break;
-				case 'legacy':
-					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + this.path;
-					break;
-				default:
-					url = false;
-			}
-			if(this.query_string !== '' && url) {
-				url += '?' + this.query_string;
-			}
-
-			return url;
-		},
-		loadHandler: function() {
-			let iframe_href = this.$refs.compatiframe.contentWindow.location.href;
-			let ci_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/';
-			let legacy_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root;
-			let routerpath = null;
-
-			this.lastLoadediFrameURL = iframe_href;
-
-			if(iframe_href.startsWith(ci_urlstart)) {
-				routerpath = iframe_href.replace(
-					ci_urlstart, '/Cis/Compat/ci/');
-			} else if(iframe_href.startsWith(legacy_urlstart)) {
-				routerpath = iframe_href.replace(
-					legacy_urlstart, '/Cis/Compat/legacy/');
-			} else {
-				return;
-			}
-
-			if(this.$route.fullPath !== routerpath) {
-				this.$router.push(routerpath);
-			}
-		}
-	},
-	template: `
-		<div class="w-100">
-			<iframe
-				ref="compatiframe"
-				v-if="srcUrl"
-				:src="srcUrl"
-				@load="loadHandler"
-				style="width:100%; height:90vh; border:0; display:block;"
-			></iframe>
-		<div v-else class="alert alert-warning">Keine URL gefunden.</div>
-		</div>
-	`
-};

public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js

@@ -2,16 +2,15 @@ export default {
 	props: {
 		data: {
 			type: String,
-		},
+		}
 	},
 	data() {
-		return {};
+		return {}
 	},
-	template: /*html*/ `
+	template: /*html*/`
     <div class="card">
         <div class="card-body">
-            <span v-if="data">{{$p.t('profil','fhAusweisStatus',[data])}}</span>
-			<span v-else>{{$p.t('profil','fhAusweisStatusNichtAusgegeben')}}</span>
+            <span  >{{$p.t('profil','fhAusweisStatus',[data])}}</span>
         </div>
     </div>`,
-};
+}

public/js/components/DetailHeader/DetailHeader.js

@@ -542,10 +542,10 @@ export default {
 
 		<template v-if="typeHeader==='mitarbeiter'">
 
-				<div class="foto-container d-flex flex-column align-items-center h-100 position-relative d-inline-block">
+				<div class="foto-container col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
 					<img
-					  class="d-block rounded"
-					  style="height: 96px;"
+					  class="d-block w-100 h-100 rounded"
+					  style="height: 84px; object-fit: contain;"
 					  alt="Profilbild"
 					  :src="getFotoSrc(headerDataMa.foto)"
 					/>
@@ -558,13 +558,15 @@ export default {
 					<template v-if="fotoEditable">
 						<button
 							type="button"
-							class="fotoedit buttonleft btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
+							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
+							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
 							@click="showDeleteModal(person_id)">
 							<i class="fa fa-xmark"></i>
 						</button>
 						<button
 							type="button"
-							class="fotoedit buttonright btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
+							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
+							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
 							@click="showModal(person_id)">
 							<i class="fa fa-pen"></i>
 						</button>

public/js/components/LRT.js

@@ -1,69 +0,0 @@
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import ApiLRT from '../api/lrt.js';
-
-export default {
-	name: 'LRTComponent',
-	props: {
-		appIdentifier: {
-			type: String,
-			required: true
-		},
-		navigationPage: {
-			type: String,
-			default: 'apps'
-		}
-	},
-	data() {
-		return {
-			items: []
-		};
-	},
-	watch: {
-		navigationPage() {
-			this.getItems();
-		}
-	},
-	methods: {
-		getItems() {
-			this.$api
-				.call(ApiNavigation.getMenu(this.navigationPage))
-				.then(result => {
-					this.items = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	created() {
-		this.getItems();
-	},
-	template: /* html */`
-	<ul class="fhc-app-menu">
-		<li v-for="(menu, key) in items" :key="key">
-			<a
-				:href="menu.link"
-				@click="menu.onClickCall"
-				:class="{ active: key === appIdentifier }"
-			>
-				<i v-if="menu.icon" class="fa fa-fw" :class="'fa-'+ menu.icon" />
-				{{ menu.description }}
-			</a>
-		</li>
-		<slot />
-	</ul>`
-};

system/dbupdate_3.4.php

@@ -94,7 +94,6 @@ require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 require_once('dbupdate_3.4/75469_le_optional_4_projektarbeit.php');
 require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
 require_once('dbupdate_3.4/70376_lohnguide.php');
-require_once('dbupdate_3.4/76203_Asynchrone_Tasks.php');
 require_once('dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php');
 require_once('dbupdate_3.4/76150_perm_other_lv_plan.php');
 require_once('dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php');
@@ -103,8 +102,6 @@ require_once('dbupdate_3.4/75959_StudVw_Automatische_Tags.php');
 require_once('dbupdate_3.4/76160_lvv_favorites.php');
 require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
 require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
-require_once('dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php');
-
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -256,7 +253,7 @@ $tabellen=array(
 	"hr.tbl_lohnguide_modellfunktion" => array("modellfunktion_kurzbz", "bezeichnung", "jobfamilie_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_modellstelle" => array("modellstelle_kurzbz", "bezeichnung", "grade", "modellfunktion_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_fachrichtung" => array("fachrichtung_kurzbz", "bezeichnung", "aktiv", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),
+	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
 	"lehre.tbl_abschlussbeurteilung"  => array("abschlussbeurteilung_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),
@@ -424,7 +421,6 @@ $tabellen=array(
 	"testtool.tbl_pruefling_frage"  => array("prueflingfrage_id","pruefling_id","frage_id","nummer","begintime","endtime"),
 	"testtool.tbl_frage_sprache"  => array("frage_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
 	"testtool.tbl_vorschlag_sprache"  => array("vorschlag_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
-	"testtool.tbl_pruefling_gebiet"  => array("prueflinggebiet_id","pruefling_id","gebiet_id","insertamum"),
 	"system.tbl_app" => array("app"),
 	"system.tbl_appdaten" => array("appdaten_id","uid","app","appversion","version","bezeichnung","daten","freigabe","insertamum","insertvon","updateamum","updatevon"),
 	"system.tbl_cronjob"  => array("cronjob_id","server_kurzbz","titel","beschreibung","file","last_execute","aktiv","running","jahr","monat","tag","wochentag","stunde","minute","standalone","reihenfolge","updateamum", "updatevon","insertamum","insertvon","variablen"),
@@ -442,7 +438,7 @@ $tabellen=array(
 	"system.tbl_log" => array("log_id","person_id","zeitpunkt","app","oe_kurzbz","logtype_kurzbz","logdata","insertvon","taetigkeit_kurzbz"),
 	"system.tbl_logtype" => array("logtype_kurzbz", "data_schema"),
 	"system.tbl_filters" => array("filter_id","app","dataset_name","filter_kurzbz","person_id","description","sort","default_filter","filter","oe_kurzbz","statistik_kurzbz"),
-	"system.tbl_jobsqueue" => array("jobid", "type", "creationtime", "status", "input", "output", "starttime", "endtime", "insertvon", "insertamum", "pid", "uid", "progress"),
+	"system.tbl_jobsqueue" => array("jobid", "type", "creationtime", "status", "input", "output", "starttime", "endtime", "insertvon", "insertamum"),
 	"system.tbl_jobstatuses" => array("status"),
 	"system.tbl_jobtriggers" => array("type", "status", "following_type"),
 	"system.tbl_jobtypes" => array("type", "description"),

system/dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php

@@ -1,41 +0,0 @@
-<?php
-if (! defined('DB_NAME')) exit('No direct script access allowed');
-
-// Creates table public.tbl_notiz_typ if it doesn't exist and grants privileges
-if (!$result = @$db->db_query('SELECT 1 FROM testtool.tbl_pruefling_gebiet LIMIT 1'))
-{
-	$qry = 'CREATE TABLE testtool.tbl_pruefling_gebiet
-			(
-				prueflinggebiet_id integer NOT NULL,
-				pruefling_id integer NOT NULL,
-				gebiet_id integer NOT NULL,
-				insertamum timestamp DEFAULT now()
-			);
-			
-			ALTER TABLE testtool.tbl_pruefling_gebiet OWNER TO fhcomplete;
-			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT pk_tbl_pruefling_gebiet PRIMARY KEY (prueflinggebiet_id);
-			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_pruefling_id FOREIGN KEY (pruefling_id) REFERENCES testtool.tbl_pruefling(pruefling_id) ON UPDATE CASCADE ON DELETE RESTRICT;
-			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_gebiet_id FOREIGN KEY (gebiet_id) REFERENCES testtool.tbl_gebiet(gebiet_id) ON UPDATE CASCADE ON DELETE RESTRICT;
-
-			CREATE SEQUENCE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq
-				START WITH 1
-				INCREMENT BY 1
-				NO MINVALUE
-				NO MAXVALUE
-				CACHE 1;
-
-			ALTER TABLE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq OWNER TO fhcomplete;
-			ALTER TABLE testtool.tbl_pruefling_gebiet ALTER COLUMN prueflinggebiet_id SET DEFAULT nextval(\'testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq\');
-
-			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO web;
-			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO vilesci;
-			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO vilesci;
-			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO web;
-			';
-
-	if (!$db->db_query($qry))
-		echo '<strong>public.tbl_pruefling_gebiet: '.$db->db_last_error().'</strong><br>';
-	else
-		echo '<br>public.tbl_pruefling_gebiet table created';
-}
-

system/dbupdate_3.4/76203_Asynchrone_Tasks.php

@@ -1,59 +0,0 @@
-<?php
-
-// Add column pid to system.tbl_jobsqueue
-if (!$result = @$db->db_query('SELECT "pid" FROM "system"."tbl_jobsqueue" LIMIT 1'))
-{
-	$qry = 'ALTER TABLE "system"."tbl_jobsqueue" ADD "pid" INT NULL DEFAULT NULL;';
-	if (!$db->db_query($qry))
-		echo '<strong>system.tbl_jobsqueue: '.$db->db_last_error().'</strong><br>';
-	else
-		echo '<br>Added column pid to table system.tbl_jobsqueue';
-}
-
-// Add column uid to system.tbl_jobsqueue
-if (!$result = @$db->db_query('SELECT "uid" FROM "system"."tbl_jobsqueue" LIMIT 1'))
-{
-	$qry = 'ALTER TABLE "system"."tbl_jobsqueue" ADD "uid" VARCHAR(32) NULL DEFAULT NULL;';
-	if (!$db->db_query($qry))
-		echo '<strong>system.tbl_jobsqueue: '.$db->db_last_error().'</strong><br>';
-	else
-		echo '<br>Added column uid to table system.tbl_jobsqueue';
-}
-
-// Add column progress to system.tbl_jobsqueue
-if (!$result = @$db->db_query('SELECT "progress" FROM "system"."tbl_jobsqueue" LIMIT 1'))
-{
-	$qry = 'ALTER TABLE "system"."tbl_jobsqueue" ADD "progress" NUMERIC(2,1) NULL DEFAULT 0;';
-	if (!$db->db_query($qry))
-		echo '<strong>system.tbl_jobsqueue: '.$db->db_last_error().'</strong><br>';
-	else
-		echo '<br>Added column progress to table system.tbl_jobsqueue';
-}
-
-// Add foreign key fk_jobsqueue_benutzer_uid on system.tbl_jobsqueue.uid with public.tbl_benutzer.uid
-if ($result = $db->db_query("SELECT conname FROM pg_constraint WHERE conname = 'fk_jobsqueue_benutzer_uid'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = 'ALTER TABLE "system"."tbl_jobsqueue" ADD CONSTRAINT "fk_jobsqueue_benutzer_uid" FOREIGN KEY ("uid") REFERENCES "public"."tbl_benutzer" ("uid") ON DELETE RESTRICT ON UPDATE CASCADE;';
-		if (!$db->db_query($qry))
-			echo '<strong>system.tbl_jobsqueue: '.$db->db_last_error().'</strong><br>';
-		else
-			echo '<br>Created foreign key fk_jobsqueue_benutzer_uid';
-	}
-}
-
-// Add new webservice type in system.tbl_webservicetyp
-if ($result = @$db->db_query("SELECT 1 FROM system.tbl_webservicetyp WHERE webservicetyp_kurzbz = 'lrt';"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "INSERT INTO system.tbl_webservicetyp(webservicetyp_kurzbz, beschreibung) VALUES('lrt', 'Long Run Task');";
-
-		if (!$db->db_query($qry))
-			echo '<strong>system.tbl_webservicetyp '.$db->db_last_error().'</strong><br>';
-		else
-			echo ' system.tbl_webservicetyp: Added webservice type "lrt"<br>';
-	}
-}
-

system/filtersupdate.php

@@ -1638,84 +1638,6 @@ $filters = array(
 			}',
 		'oe_kurzbz' => null,
 	),
-	array(
-		'app' => 'core',
-		'dataset_name' => 'logs',
-		'filter_kurzbz' => 'lrts24hours',
-		'description' => '{Last 24 hours LRTs logs}',
-		'sort' => 2,
-		'default_filter' => false,
-		'filter' => '
-			{
-				"name": "All Long Run Tasks logs from the last 24 hours",
-				"columns": [
-					{"name": "RequestId"},
-					{"name": "ExecutionTime"},
-					{"name": "ExecutedBy"},
-					{"name": "Description"},
-					{"name": "Data"}
-				],
-				"filters": [
-					{
-						"name": "WebserviceType",
-						"operation": "contains",
-						"condition": "job"
-					},
-					{
-						"name": "RequestId",
-						"operation": "contains",
-						"condition": "LRT"
-					},
-					{
-						"name": "ExecutionTime",
-						"operation": "lt",
-						"condition": "24",
-						"option": "hours"
-					}
-				]
-			}
-		',
-		'oe_kurzbz' => null,
-	),
-	array(
-		'app' => 'core',
-		'dataset_name' => 'logs',
-		'filter_kurzbz' => 'lrts48hours',
-		'description' => '{Last 48 hours LRTs logs}',
-		'sort' => 2,
-		'default_filter' => false,
-		'filter' => '
-			{
-				"name": "All Long Run Tasks logs from the last 48 hours",
-				"columns": [
-					{"name": "RequestId"},
-					{"name": "ExecutionTime"},
-					{"name": "ExecutedBy"},
-					{"name": "Description"},
-					{"name": "Data"}
-				],
-				"filters": [
-					{
-						"name": "WebserviceType",
-						"operation": "contains",
-						"condition": "job"
-					},
-					{
-						"name": "RequestId",
-						"operation": "contains",
-						"condition": "LRT"
-					},
-					{
-						"name": "ExecutionTime",
-						"operation": "lt",
-						"condition": "48",
-						"option": "hours"
-					}
-				]
-			}
-		',
-		'oe_kurzbz' => null,
-	),
 );
 
 // Loop through the filters array

system/phrasesupdate.php

@@ -19829,26 +19829,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'massnahmeneinmalig',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Diese Maßnahme ist nur einmalig planbar.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'This measure may only be planned once.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20629,26 +20609,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'personenMassnahmen',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'alle Maßnahmen der Personen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => ' all measures of the people',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20729,46 +20689,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'einmalig',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Nur einmal planbar',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'One-time only',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'erroreinmalig',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Diese Maßnahme kann nur einmal geplant werden',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'This measure can only be planned once.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'gruppenmanagement',
@@ -29443,26 +29363,6 @@ array(
 				)
 			)
 		),
-		array(
-			'app' => 'core',
-			'category' => 'profil',
-			'phrase' => 'fhAusweisStatusNichtAusgegeben',
-			'insertvon' => 'system',
-			'phrases' => array(
-				array(
-					'sprache' => 'German',
-					'text' => 'Der FH Ausweis wurde noch nicht ausgegeben.',
-					'description' => '',
-					'insertvon' => 'system'
-				),
-				array(
-					'sprache' => 'English',
-					'text' => 'The FH ID card has not been issued yet.',
-					'description' => '',
-					'insertvon' => 'system'
-				)
-			)
-		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',
@@ -35800,6 +35700,226 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntUploadFileTooLarge',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Datei ist {size} MB groß. Die maximale Dateigröße ist {max} MB. Verkleinern Sie die Datei und laden Sie sie erneut hoch. Fotografieren Sie das Dokument zum Beispiel mit geringerer Auflösung oder komprimieren Sie das PDF.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The file is {size} MB. The maximum file size is {max} MB. Make the file smaller and upload it again. For example, take the photo of the document with a lower resolution or compress the PDF.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntUploadFiletype',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Dateityp von »{file}« ist nicht erlaubt. Erlaubte Dateitypen: {filetypes}. Speichern Sie die Datei in einem erlaubten Dateityp und laden Sie sie erneut hoch.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The file type of "{file}" is not allowed. Allowed file types: {filetypes}. Save the file in an allowed file type and upload it again.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntUploadContent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Server kann »{file}« nicht als {type}-Datei lesen. Die Datei ist beschädigt oder hat eine falsche Dateiendung. Öffnen Sie die Datei und speichern Sie sie erneut in einem dieser Dateitypen: {filetypes}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The server cannot read "{file}" as a {type} file. The file is damaged or has an incorrect file extension. Open the file and save it again in one of these file types: {filetypes}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntUploadEmptyFile',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Datei »{file}« ist leer. Wählen Sie eine andere Datei aus.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The file "{file}" is empty. Select a different file.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntUploadPartial',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Server hat die Datei nicht vollständig erhalten. Prüfen Sie Ihre Internetverbindung und laden Sie die Datei erneut hoch.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The server did not receive the complete file. Check your internet connection and upload the file again.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntUploadNoFile',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Server hat keine Datei erhalten. Wählen Sie die Datei noch einmal aus und laden Sie sie erneut hoch.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The server did not receive a file. Select the file again and upload it.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntUploadTechnical',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Server kann die Datei wegen eines technischen Problems nicht speichern. Versuchen Sie es später erneut. Wenn der Fehler bleibt, wenden Sie sich an den Support und nennen Sie die Fehlernummer {reference}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The server cannot save the file because of a technical problem. Try again later. If the error continues, contact the support team and give them the error number {reference}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntAlreadyAccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Entschuldigung hat bereits den Status »akzeptiert«. Sie müssen kein Dokument mehr nachreichen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This excuse note already has the status "accepted". You do not have to upload a document.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'errorEntAlreadyDeclined',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Entschuldigung hat bereits den Status »abgelehnt«. Sie können kein Dokument mehr nachreichen. Wenn Sie Fragen haben, wenden Sie sich an Ihre Studiengangsassistenz.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This excuse note already has the status "declined". You cannot upload a document for it. If you have questions, contact your study program assistant.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entUploadAllowedFiletypes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erlaubte Dateitypen: {filetypes}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Allowed file types: {filetypes}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entUploadMaxFilesize',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Maximale Dateigröße: {max} MB.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Maximum file size: {max} MB.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

vilesci/stammdaten/auswertung_fhtw.php

@@ -251,31 +251,6 @@ if ($deleteSingleResult)
 			exit();
 		}
 
-		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet
-				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "";
-
-		if ($db->db_query($qry))
-		{
-			while ($row = $db->db_fetch_object())
-			{
-				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id, insertamum) VALUES (" .
-					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
-					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
-					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
-					$db->db_add_param($row->insertamum) . ');';
-			}
-		}
-		else
-		{
-			$db->db_query('ROLLBACK');
-			echo json_encode(array(
-				'status' => 'fehler',
-				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
-			));
-			exit();
-		}
-
-
 		//Antworten loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND
 				frage_id IN (SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ");
@@ -283,9 +258,7 @@ if ($deleteSingleResult)
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));
-				
-				DELETE FROM testtool.tbl_pruefling_gebiet where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ";";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));";
 
 		if ($result = $db->db_query($qry))
 		{
@@ -415,35 +388,9 @@ if ($deleteAllResults)
 			exit();
 		}
 
-		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . ";
-				";
-
-		if ($db->db_query($qry))
-		{
-			while ($row = $db->db_fetch_object())
-			{
-				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id,insertamum) VALUES (" .
-					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
-					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
-					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
-					$db->db_add_param($row->insertamum) . ');';
-			}
-		}
-		else
-		{
-			$db->db_query('ROLLBACK');
-			echo json_encode(array(
-				'status' => 'fehler',
-				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
-			));
-			exit();
-		}
-
-
 		//Antworten loeschen
 		$qry = "	DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-					DELETE FROM testtool.tbl_antwort where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-					DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+					DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if ($result = $db->db_query($qry))
 		{

vilesci/stammdaten/reihungstest_administration.php

@@ -402,10 +402,7 @@ if(isset($_POST['deleteteilgebiet']))
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));
-				
-				DELETE FROM testtool.tbl_pruefling_gebiet
-				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND gebiet_id=".$db->db_add_param($_POST['gebiet']).";";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));";
 
 		if($result = $db->db_query($qry))
 		{
@@ -500,8 +497,7 @@ if(isset($_POST['delete_all']))
 		}
 		//Gebiet loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-				DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if($result = $db->db_query($qry))
 		{