mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-07 23:29:28 +00:00
Code quality check improvements
This commit is contained in:
@@ -67,21 +67,19 @@ $dirlist = scandir($subdir);
|
||||
|
||||
if ($dirlist)
|
||||
{
|
||||
$files = array_diff($dirlist, array('.','..'));
|
||||
$files = array_diff($dirlist, array('.','..'));
|
||||
|
||||
foreach ($files as &$item)
|
||||
{
|
||||
foreach ($files as &$item)
|
||||
{
|
||||
if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
|
||||
{
|
||||
$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
|
||||
|
||||
if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
|
||||
{
|
||||
$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
|
||||
|
||||
if (file_exists($routes_file))
|
||||
{
|
||||
require($routes_file);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
if (file_exists($routes_file))
|
||||
{
|
||||
require($routes_file);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -77,8 +77,8 @@ class Gruppenmanagement extends Auth_Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets Benutzer assigned to a Gruppe
|
||||
*/
|
||||
* Gets Benutzer assigned to a Gruppe
|
||||
*/
|
||||
public function getBenutzer()
|
||||
{
|
||||
$gruppe_kurzbz = $this->input->get('gruppe_kurzbz');
|
||||
@@ -92,8 +92,8 @@ class Gruppenmanagement extends Auth_Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets all Benutzer for assignment to Gruppe
|
||||
*/
|
||||
* Gets all Benutzer for assignment to Gruppe
|
||||
*/
|
||||
public function getAllBenutzer()
|
||||
{
|
||||
$this->BenutzerModel->addSelect('uid, vorname, nachname');
|
||||
|
||||
@@ -1,20 +1,19 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* FH-Complete
|
||||
* Copyright (C) 2022 fhcomplete.org
|
||||
*
|
||||
* @package FHC-Helper
|
||||
* @author FHC-Team
|
||||
* @copyright Copyright (c) 2016 fhcomplete.org
|
||||
* @license GPLv3
|
||||
* @since Version 1.0.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* FHC Helper
|
||||
* 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.
|
||||
*
|
||||
* @subpackage Helpers
|
||||
* @category Helpers
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
if (! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
@@ -42,15 +41,19 @@ function generateToken($length = 64)
|
||||
{
|
||||
$firstGeneratedToken = random_bytes($length); // try to generates cryptographically secure pseudo-random bytes...
|
||||
}
|
||||
catch (Exception $e) { $firstGeneratedToken = null; } // if fails $firstGeneratedToken is set to null
|
||||
catch (Exception $e)
|
||||
{
|
||||
// If fails $firstGeneratedToken is set to null
|
||||
$firstGeneratedToken = null;
|
||||
}
|
||||
}
|
||||
// For PHP >= 5.3 and < 7 and openssl is available
|
||||
elseif (function_exists('openssl_random_pseudo_bytes'))
|
||||
{
|
||||
$firstGeneratedToken = openssl_random_pseudo_bytes($length, $strong);
|
||||
// If the token generation ended with errors OR the generated token is NOT strong enough
|
||||
if ($firstGeneratedToken == false || $strong == false) $firstGeneratedToken = null; // $firstGeneratedToken is set to null
|
||||
}
|
||||
if ($firstGeneratedToken == false || $strong == false) $firstGeneratedToken = null; // $firstGeneratedToken is set to null
|
||||
}
|
||||
|
||||
if ($firstGeneratedToken != null) // If everything was fine
|
||||
{
|
||||
@@ -107,10 +110,7 @@ function var_dump_to_error_log($parameter)
|
||||
function loadResource($path, $resources = null, $subdir = false)
|
||||
{
|
||||
// Place a / character at the and of the string if not present
|
||||
if (strrpos($path, '/') < strlen($path) - 1)
|
||||
{
|
||||
$path .= '/';
|
||||
}
|
||||
if (strrpos($path, '/') < strlen($path) - 1) $path .= '/';
|
||||
|
||||
// Loads in $tmpResources all the given resources
|
||||
$tmpResources = $resources;
|
||||
@@ -125,28 +125,36 @@ function loadResource($path, $resources = null, $subdir = false)
|
||||
|
||||
// Loads in $tmpPaths path and eventually the subdirectories
|
||||
$tmpPaths = array($path);
|
||||
// NOTE: Used @ to prevent ugly error messages
|
||||
if (is_dir($path) && ($dirHandler = @opendir($path)) !== false)
|
||||
|
||||
// If path is a directory
|
||||
if (is_dir($path))
|
||||
{
|
||||
// Reads all file system entries present in path
|
||||
while (($entry = readdir($dirHandler)) !== false)
|
||||
// NOTE: Used @ to prevent ugly error messages
|
||||
$dirHandler = @opendir($path);
|
||||
|
||||
// Successfully opened
|
||||
if ($dirHandler !== false)
|
||||
{
|
||||
// If entry is a directory but not the current and subdirectories should be loaded
|
||||
if ($subdir === true && $entry != '.' && $entry != '..' && is_dir($path.$entry))
|
||||
// Reads all file system entries present in path
|
||||
while (($entry = readdir($dirHandler)) !== false)
|
||||
{
|
||||
$tmpPaths[] = $path.$entry.'/';
|
||||
}
|
||||
// If no resources are specified and the current file system entry is a file
|
||||
if ($resources == null && is_file($path.$entry))
|
||||
{
|
||||
// If the current entry is a php file store the name without extension
|
||||
if ($entry != ($tmpName = str_replace('.php', '', $entry)))
|
||||
// If entry is a directory but not the current and subdirectories should be loaded
|
||||
if ($subdir === true && $entry != '.' && $entry != '..' && is_dir($path.$entry))
|
||||
{
|
||||
$tmpResources[] = $tmpName;
|
||||
$tmpPaths[] = $path.$entry.'/';
|
||||
}
|
||||
// If no resources are specified and the current file system entry is a file
|
||||
if ($resources == null && is_file($path.$entry))
|
||||
{
|
||||
// Name without php extension
|
||||
$tmpName = str_replace('.php', '', $entry);
|
||||
|
||||
// If the current entry is a php file store the name without extension
|
||||
if ($entry != $tmpName) $tmpResources[] = $tmpName;
|
||||
}
|
||||
}
|
||||
closedir($dirHandler);
|
||||
}
|
||||
closedir($dirHandler);
|
||||
}
|
||||
|
||||
// Loops through the resources
|
||||
@@ -156,10 +164,7 @@ function loadResource($path, $resources = null, $subdir = false)
|
||||
foreach ($tmpPaths as $tmpPath)
|
||||
{
|
||||
$fileName = $tmpPath.$tmpResource.'.php'; // Php extension
|
||||
if (file_exists($fileName))
|
||||
{
|
||||
include_once($fileName);
|
||||
}
|
||||
if (file_exists($fileName)) include_once($fileName);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -362,36 +367,39 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
|
||||
|
||||
// Loads in $tmpPaths path and eventually the subdirectories
|
||||
$tmpPaths = array($path);
|
||||
// NOTE: Used @ to prevent ugly error messages
|
||||
if (is_dir($path) && ($dirHandler = @opendir($path)) !== false)
|
||||
if (is_dir($path))
|
||||
{
|
||||
// Reads all file system entries present in path
|
||||
while (($entry = readdir($dirHandler)) !== false)
|
||||
// NOTE: Used @ to prevent ugly error messages
|
||||
$dirHandler = @opendir($path);
|
||||
|
||||
// Successfully opened
|
||||
if ($dirHandler !== false)
|
||||
{
|
||||
// If entry is a directory but not the current and subdirectories should be loaded
|
||||
if ($subdir === true && $entry != '.' && $entry != '..' && is_dir($path.$entry))
|
||||
// Reads all file system entries present in path
|
||||
while (($entry = readdir($dirHandler)) !== false)
|
||||
{
|
||||
if ($extraDir == null)
|
||||
// If entry is a directory but not the current and subdirectories should be loaded
|
||||
if ($subdir === true && $entry != '.' && $entry != '..' && is_dir($path.$entry))
|
||||
{
|
||||
$tmpPaths[] = $path.$entry.'/';
|
||||
}
|
||||
else
|
||||
{
|
||||
$tmpPaths[] = $path.$entry.'/'.$extraDir.'/';
|
||||
if ($extraDir == null)
|
||||
{
|
||||
$tmpPaths[] = $path.$entry.'/';
|
||||
}
|
||||
else
|
||||
{
|
||||
$tmpPaths[] = $path.$entry.'/'.$extraDir.'/';
|
||||
}
|
||||
}
|
||||
}
|
||||
closedir($dirHandler);
|
||||
}
|
||||
closedir($dirHandler);
|
||||
}
|
||||
|
||||
// Loops through the paths
|
||||
foreach ($tmpPaths as $tmpPath)
|
||||
{
|
||||
$fileName = $tmpPath.$resource.'.php'; // Php extension
|
||||
if (file_exists($fileName))
|
||||
{
|
||||
return $fileName;
|
||||
}
|
||||
if (file_exists($fileName)) return $fileName;
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
@@ -181,16 +181,26 @@ function generateAddonsJSsInclude($calledFrom)
|
||||
{
|
||||
$aktive_addons = array_filter(explode(";", ACTIVE_ADDONS));
|
||||
|
||||
// For each active addon
|
||||
foreach ($aktive_addons as $addon)
|
||||
{
|
||||
// Build the path to the hook file
|
||||
$hookfile = DOC_ROOT.'addons/'.$addon.'/hooks.config.inc.php';
|
||||
|
||||
// If the hook file exists
|
||||
if (file_exists($hookfile))
|
||||
{
|
||||
include($hookfile);
|
||||
$js_hooks = array(); // default value
|
||||
|
||||
include($hookfile); // include the hook file where the array js_hooks should be setup
|
||||
|
||||
// If it contains the provided key calledFrom
|
||||
if (key_exists($calledFrom, $js_hooks))
|
||||
{
|
||||
foreach ($js_hooks[$calledFrom] as $js_file)
|
||||
{
|
||||
generateJSsInclude('addons/'.$addon.'/'.$js_file);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,25 @@
|
||||
<?php
|
||||
/**
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
if (! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
use \stdClass as stdClass;
|
||||
|
||||
/**
|
||||
* Library to manage core extensions
|
||||
*/
|
||||
@@ -181,17 +199,15 @@ class ExtensionsLib
|
||||
// Select all the version of this extension
|
||||
$this->_ci->ExtensionsModel->addSelect('extension_id');
|
||||
$result = $this->_ci->ExtensionsModel->loadWhere(array('name' => $extensionName));
|
||||
if (hasData($result)) // if something was found
|
||||
// If something was found
|
||||
if (hasData($result))
|
||||
{
|
||||
$extsArray = array();
|
||||
foreach ($result->retval as $key => $extension) // loops on them
|
||||
// Loops on them
|
||||
foreach ($result->retval as $extension)
|
||||
{
|
||||
// Remove them all
|
||||
$result = $this->_ci->ExtensionsModel->delete($extension->extension_id);
|
||||
if (isSuccess($result))
|
||||
{
|
||||
$delExtension = true;
|
||||
}
|
||||
if (isSuccess($result)) $delExtension = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -432,7 +448,11 @@ class ExtensionsLib
|
||||
// If no errors occurred
|
||||
if ($extensionJson != null)
|
||||
{
|
||||
// Default value
|
||||
$fhcomplete_version = 0;
|
||||
|
||||
require_once('version.php'); // get the core version
|
||||
|
||||
// Checks if the required core version of the extension is the same of this system
|
||||
if (isset($extensionJson->core_version) && $extensionJson->core_version == $fhcomplete_version)
|
||||
{
|
||||
@@ -587,18 +607,22 @@ class ExtensionsLib
|
||||
for ($sqlDir = $startVersion; $sqlDir <= $extensionJson->version; $sqlDir++)
|
||||
{
|
||||
// If a directory with the same value of the version is present in the sql scripts directory
|
||||
if (($files = glob($pkgSQLsPath.'/'.$sqlDir.'/*'.ExtensionsLib::SQL_FILE_EXTENSION)) != false)
|
||||
{
|
||||
$files = glob($pkgSQLsPath.'/'.$sqlDir.'/*'.ExtensionsLib::SQL_FILE_EXTENSION);
|
||||
if ($files != false)
|
||||
{
|
||||
// Loads every sql files
|
||||
foreach ($files as $file)
|
||||
{
|
||||
$sql = file_get_contents($file); // gets the entire content of the file
|
||||
foreach ($files as $file)
|
||||
{
|
||||
$sql = file_get_contents($file); // gets the entire content of the file
|
||||
|
||||
$this->_printMessage('Executing query:');
|
||||
$this->_printMessage($sql);
|
||||
|
||||
// Try to execute that
|
||||
if (!isSuccess($result = @$this->_ci->ExtensionsModel->executeQuery($sql)))
|
||||
$resultQuery = @$this->_ci->ExtensionsModel->executeQuery($sql);
|
||||
|
||||
// If _not_ a success
|
||||
if (!isSuccess($resultQuery))
|
||||
{
|
||||
$this->_errorOccurred = true;
|
||||
$this->_printFailure(' error occurred while executing the query');
|
||||
@@ -608,11 +632,11 @@ class ExtensionsLib
|
||||
else
|
||||
{
|
||||
$this->_printMessage('Query result:');
|
||||
var_dump($result->retval); // KEEP IT!!!
|
||||
var_dump(getData($resultQuery)); // KEEP IT!!!
|
||||
$this->_ci->eprintflib->printEOL();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->_printSuccess(!$this->_errorOccurred);
|
||||
@@ -673,7 +697,7 @@ class ExtensionsLib
|
||||
|
||||
foreach ($this->SOFTLINK_TARGET_DIRECTORIES as $rootPath => $targetDirectories)
|
||||
{
|
||||
foreach ($targetDirectories as $key => $targetDirectory)
|
||||
foreach ($targetDirectories as $targetDirectory)
|
||||
{
|
||||
if (file_exists($rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName))
|
||||
{
|
||||
@@ -727,7 +751,7 @@ class ExtensionsLib
|
||||
// For every target directory
|
||||
foreach ($this->SOFTLINK_TARGET_DIRECTORIES as $rootPath => $targetDirectories)
|
||||
{
|
||||
foreach ($targetDirectories as $key => $targetDirectory)
|
||||
foreach ($targetDirectories as $targetDirectory)
|
||||
{
|
||||
// If destination of the symlink does not exist
|
||||
if (!file_exists($rootPath.$targetDirectory.'/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName))
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
if (! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
use \stdClass as stdClass;
|
||||
|
||||
/**
|
||||
* Filter component logic
|
||||
*/
|
||||
@@ -92,8 +94,8 @@ class FilterCmptLib
|
||||
private $_ci; // Code igniter instance
|
||||
|
||||
private $_filterUniqueId; // Unique id for this filter component
|
||||
private $_filterType; //
|
||||
private $_filterId; //
|
||||
private $_filterType; //
|
||||
private $_filterId; //
|
||||
|
||||
private $_app;
|
||||
private $_datasetName;
|
||||
@@ -133,6 +135,8 @@ class FilterCmptLib
|
||||
//
|
||||
if (!$this->_checkJSParameters()) return;
|
||||
|
||||
$filterCmptArray = array(); // default value
|
||||
|
||||
//
|
||||
$filePath = findResource(APPPATH.'components/filters/', $this->_filterType, true);
|
||||
if (!isEmptyString($filePath))
|
||||
@@ -147,7 +151,7 @@ class FilterCmptLib
|
||||
}
|
||||
|
||||
//
|
||||
if (!isset($filterCmptArray))
|
||||
if (!isset($filterCmptArray) && isEmptyArray($filterCmptArray))
|
||||
{
|
||||
$this->_setSession(error('Component definition file '.$this->_filterType.' not found'));
|
||||
return;
|
||||
@@ -156,7 +160,7 @@ class FilterCmptLib
|
||||
//
|
||||
if (!$this->_checkPHPParameters($filterCmptArray)) return;
|
||||
|
||||
//
|
||||
//
|
||||
$this->_initFilterCmpt($filterCmptArray);
|
||||
|
||||
//
|
||||
@@ -340,7 +344,8 @@ class FilterCmptLib
|
||||
if (in_array($selectedField, $fields))
|
||||
{
|
||||
// If the selected field is present in the list of the selected fields by the current filter
|
||||
if (($pos = array_search($selectedField, $selectedFields)) !== false)
|
||||
$pos = array_search($selectedField, $selectedFields);
|
||||
if ($pos !== false)
|
||||
{
|
||||
// Then remove it and shift the rest of elements by one if needed
|
||||
array_splice($selectedFields, $pos, 1);
|
||||
@@ -453,7 +458,7 @@ class FilterCmptLib
|
||||
// If not an empty array
|
||||
if ($filterField != null)
|
||||
{
|
||||
//
|
||||
//
|
||||
if (isset($filterField->name) && isset($filterField->operation) && isset($filterField->condition)
|
||||
&& !isEmptyString($filterField->name) && !isEmptyString($filterField->operation)
|
||||
&& !isEmptyString($filterField->condition))
|
||||
@@ -479,14 +484,14 @@ class FilterCmptLib
|
||||
break;
|
||||
}
|
||||
}
|
||||
else //
|
||||
else //
|
||||
{
|
||||
$fine = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
if ($fine)
|
||||
{
|
||||
// Write changes into the session
|
||||
@@ -640,9 +645,6 @@ class FilterCmptLib
|
||||
// If filters were loaded
|
||||
if (hasData($filters))
|
||||
{
|
||||
$childrenArray = array(); // contains all the children elements in a menu entry
|
||||
$childrenPersonalArray = array(); // contains all the children elements in menu enty for personal filters
|
||||
|
||||
// Loops through loaded filters
|
||||
foreach (getData($filters) as $filter)
|
||||
{
|
||||
@@ -977,12 +979,11 @@ class FilterCmptLib
|
||||
{
|
||||
$columnsNames = array();
|
||||
|
||||
foreach ($columns as $key => $obj)
|
||||
// For each column
|
||||
foreach ($columns as $obj)
|
||||
{
|
||||
if (isset($obj->name))
|
||||
{
|
||||
$columnsNames[] = $obj->name;
|
||||
}
|
||||
// If it is set the property name of the column
|
||||
if (isset($obj->name)) $columnsNames[] = $obj->name;
|
||||
}
|
||||
|
||||
return $columnsNames;
|
||||
@@ -1209,7 +1210,7 @@ class FilterCmptLib
|
||||
private function _getFilterName($filterJson)
|
||||
{
|
||||
$filterName = $filterJson->name; // always present, used as default
|
||||
$trimedname = (isset($filterJson->namePhrase)?trim($filterJson->namePhrase):'');
|
||||
|
||||
// Filter name from phrases system
|
||||
if (isset($filterJson->namePhrase) && !isEmptyString($filterJson->namePhrase))
|
||||
{
|
||||
|
||||
@@ -83,9 +83,19 @@ class NavigationLib
|
||||
* Returns the structure for one level of the menu
|
||||
*/
|
||||
public function oneLevel(
|
||||
$description, $link = '#', $children = null, $icon = '', $expand = false,
|
||||
$subscriptDescription = null, $subscriptLinkClass = null, $subscriptLinkValue = null, $target = '',
|
||||
$sort = null, $requiredPermissions = null, $subscriptLinkHref = '#')
|
||||
$description,
|
||||
$link = '#',
|
||||
$children = null,
|
||||
$icon = '',
|
||||
$expand = false,
|
||||
$subscriptDescription = null,
|
||||
$subscriptLinkClass = null,
|
||||
$subscriptLinkValue = null,
|
||||
$target = '',
|
||||
$sort = null,
|
||||
$requiredPermissions = null,
|
||||
$subscriptLinkHref = '#'
|
||||
)
|
||||
{
|
||||
return array(
|
||||
'description' => $description,
|
||||
@@ -239,7 +249,8 @@ class NavigationLib
|
||||
$filename = APPPATH.'config/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/'.self::CONFIG_NAVIGATION_FILENAME;
|
||||
if (file_exists($filename))
|
||||
{
|
||||
unset($config);
|
||||
$config = array(); // default value
|
||||
|
||||
include($filename);
|
||||
|
||||
if (isset($config[$configName]) && is_array($config[$configName]))
|
||||
@@ -294,7 +305,7 @@ class NavigationLib
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach ($navigationArray as $key=>$row)
|
||||
foreach ($navigationArray as $key => $row)
|
||||
{
|
||||
// Search for * Entries
|
||||
if (mb_strpos($key, '*') === 0 || mb_strpos($key, '*') === mb_strlen($key) - 1)
|
||||
|
||||
@@ -18,12 +18,14 @@
|
||||
|
||||
if (! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
use \stdClass as stdClass;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
class SearchBarLib
|
||||
{
|
||||
//
|
||||
// Error constats
|
||||
const ERROR_WRONG_JSON = 'ERR001';
|
||||
const ERROR_WRONG_SEARCHSTR = 'ERR002';
|
||||
const ERROR_NO_TYPES = 'ERR003';
|
||||
|
||||
@@ -101,7 +101,7 @@ $this->load->view(
|
||||
<th class="col-xs-5 col-lg-2"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?> *</th>
|
||||
<td>
|
||||
<select name="lehrveranstaltung_id" id="select-lehrveranstaltung" class="form-control select-w500">
|
||||
<option value="" <?php echo set_select('lehrveranstaltung', '', TRUE); ?> >
|
||||
<option value="" <?php echo set_select('lehrveranstaltung', '', true); ?> >
|
||||
<?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
|
||||
</option>
|
||||
</select>
|
||||
@@ -112,7 +112,7 @@ $this->load->view(
|
||||
<th class="col-xs-5 col-lg-2"><?php echo $this->p->t('global', 'begruendung'); ?> *</th>
|
||||
<td>
|
||||
<select name="begruendung_id" id="select-begruendung" class="form-control select-w500">
|
||||
<option value="" <?php echo set_select('begruendung', '', TRUE); ?> >
|
||||
<option value="" <?php echo set_select('begruendung', '', true); ?> >
|
||||
<?php echo $this->p->t('ui', 'bitteWaehlen'); ?>
|
||||
</option>
|
||||
<?php foreach ($begruendungen as $begruendung) : ?>
|
||||
|
||||
@@ -225,3 +225,4 @@ $this->load->view(
|
||||
</body>
|
||||
|
||||
<?php $this->load->view('templates/FHC-Footer'); ?>
|
||||
|
||||
|
||||
@@ -210,3 +210,4 @@ $this->load->view(
|
||||
</body>
|
||||
|
||||
<?php $this->load->view('templates/FHC-Footer'); ?>
|
||||
|
||||
|
||||
@@ -169,7 +169,9 @@ $this->load->view(
|
||||
);
|
||||
?>
|
||||
</div>
|
||||
<button type="submit" name="submit" value="anzeigen" class="btn btn-default form-group"><?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?></button>
|
||||
<button type="submit" name="submit" value="anzeigen" class="btn btn-default form-group">
|
||||
<?php echo ucfirst($this->p->t('ui', 'anzeigen')); ?>
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@@ -204,4 +206,5 @@ $this->load->view(
|
||||
<br>
|
||||
</body>
|
||||
|
||||
<?php $this->load->view('templates/FHC-Footer'); ?>
|
||||
<?php $this->load->view('templates/FHC-Footer'); ?>
|
||||
|
||||
|
||||
@@ -49,7 +49,9 @@ $this->load->view(
|
||||
<!-- title -->
|
||||
<div class="row">
|
||||
<div class="col-lg-12 page-header">
|
||||
<h3>Zeitverfügbarkeiten verwalten<small> | Punktuelle Zeitverfügbarkeiten von Lehrenden für die LV-Planung verwalten</small></h3>
|
||||
<h3>Zeitverfügbarkeiten verwalten<small>
|
||||
| Punktuelle Zeitverfügbarkeiten von Lehrenden für die LV-Planung verwalten</small>
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -229,4 +229,5 @@ $this->load->view(
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -33,25 +33,25 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h3 class="page-header">
|
||||
<?php echo $this->p->t('abschlusspruefung','pruefungsprotokoll'); ?>
|
||||
<?php echo $this->p->t('abschlusspruefung', 'pruefungsprotokoll'); ?>
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
<?php echo $this->p->t('abschlusspruefung','einfuehrungstext'); ?>
|
||||
<?php echo $this->p->t('abschlusspruefung', 'einfuehrungstext'); ?>
|
||||
<br><br>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<form action="" method="post">
|
||||
<label><?php echo $this->p->t('ui','zeitraum'); ?>: </label>
|
||||
<label><?php echo $this->p->t('ui', 'zeitraum'); ?>: </label>
|
||||
<div class="btn-group" role="group">
|
||||
<button type="submit" class="btn btn-default <?php echo $period == 'today' ? 'active' : ''?>"
|
||||
name="period" value="today"><?php echo $this->p->t('ui','heute'); ?></button>
|
||||
name="period" value="today"><?php echo $this->p->t('ui', 'heute'); ?></button>
|
||||
<button type="submit" class="btn btn-default <?php echo $period == 'lastWeek' ? 'active' : ''?>"
|
||||
name="period" value="lastWeek"><?php echo $this->p->t('ui','letzteWoche'); ?></button>
|
||||
name="period" value="lastWeek"><?php echo $this->p->t('ui', 'letzteWoche'); ?></button>
|
||||
<button type="submit" class="btn btn-default <?php echo $period == 'upcoming' ? 'active' : ''?>"
|
||||
name="period" value="upcoming"><?php echo $this->p->t('ui','zukuenftige'); ?></button>
|
||||
name="period" value="upcoming"><?php echo $this->p->t('ui', 'zukuenftige'); ?></button>
|
||||
<button type="submit" class="btn btn-default <?php echo $period == 'all' ? 'active' : ''?>"
|
||||
name="period" value="all"><?php echo $this->p->t('ui','alle'); ?></button>
|
||||
name="period" value="all"><?php echo $this->p->t('ui', 'alle'); ?></button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -76,5 +76,4 @@
|
||||
$filterWidgetArray['filter_id'] = $this->input->get('filter_id');
|
||||
|
||||
echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
|
||||
?>
|
||||
|
||||
|
||||
@@ -64,62 +64,62 @@
|
||||
<table class="table">
|
||||
<?php if (!empty($stammdaten->titelpre)): ?>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','titelpre')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'titelpre')) ?></strong></td>
|
||||
<td><?php echo $stammdaten->titelpre ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','vorname')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'vorname')) ?></strong></td>
|
||||
<td><?php echo $stammdaten->vorname ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','nachname')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'nachname')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo $stammdaten->nachname ?></td>
|
||||
</tr>
|
||||
<?php if (!empty($stammdaten->titelpost)): ?>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','titelpost')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'titelpost')) ?></strong></td>
|
||||
<td><?php echo $stammdaten->titelpost ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','geburtsdatum')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'geburtsdatum')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','svnr')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'svnr')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo $stammdaten->svnr ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','ersatzkennzeichen')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'ersatzkennzeichen')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo $stammdaten->ersatzkennzeichen ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','staatsbuergerschaft')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'staatsbuergerschaft')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo $stammdaten->staatsbuergerschaft ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','geschlecht')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'geschlecht')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo $stammdaten->geschlecht ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','bpk')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'bpk')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo $stammdaten->bpk ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','postleitzahl')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'postleitzahl')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo $adresse->plz ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person','strasse')) ?></strong></td>
|
||||
<td><strong><?php echo ucfirst($this->p->t('person', 'strasse')) ?></strong></td>
|
||||
<td>
|
||||
<?php echo $adresse->strasse ?></td>
|
||||
</tr>
|
||||
@@ -129,7 +129,7 @@
|
||||
<form action="<?php echo base_url('soap/datenverbund_client.php?action=pruefeBPK');?>" method="POST" target="_blank">
|
||||
<input type="hidden" name="vorname" value="<?php echo $stammdaten->vorname; ?>"/>
|
||||
<input type="hidden" name="nachname" value="<?php echo $stammdaten->nachname; ?>"/>
|
||||
<input type="hidden" name="geburtsdatum" value="<?php echo mb_str_replace('-','',$stammdaten->gebdatum); ?>"/>
|
||||
<input type="hidden" name="geburtsdatum" value="<?php echo mb_str_replace('-', '',$stammdaten->gebdatum); ?>"/>
|
||||
<input type="hidden" name="geschlecht" value="<?php echo mb_strtoupper($stammdaten->geschlecht); ?>"/>
|
||||
<input type="submit" value="Namenssuche starten" class="btn btn-default"/>
|
||||
</form>
|
||||
|
||||
@@ -31,14 +31,26 @@
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<b><?php echo $this->p->t('lehre', 'notendurchschnitt'); ?>
|
||||
<img src="../../../../skin/images/information.png" title="<?php echo htmlentities($this->p->t('lehre', 'info_notendurchschnitt')); ?>" />:</b>
|
||||
<b>
|
||||
<?php echo $this->p->t('lehre', 'notendurchschnitt'); ?>
|
||||
<img
|
||||
src="../../../../skin/images/information.png"
|
||||
title="<?php echo htmlentities($this->p->t('lehre', 'info_notendurchschnitt')); ?>"
|
||||
/>:
|
||||
</b>
|
||||
<?php echo $courses['overall']['notendurchschnitt'] ?><br>
|
||||
<b><?php echo $this->p->t('lehre', 'gewichteternotendurchschnitt'); ?>
|
||||
<img src="../../../../skin/images/information.png" title="<?php echo htmlentities($this->p->t('lehre', 'info_notendurchschnitt_gewichtet')); ?>" />:</b>
|
||||
<b>
|
||||
<?php echo $this->p->t('lehre', 'gewichteternotendurchschnitt'); ?>
|
||||
<img
|
||||
src="../../../../skin/images/information.png"
|
||||
title="<?php echo htmlentities($this->p->t('lehre', 'info_notendurchschnitt_gewichtet')); ?>"
|
||||
/>:
|
||||
</b>
|
||||
<?php echo $courses['overall']['notendurchschnittgewichtet'] ?><br>
|
||||
<b><?php echo $this->p->t('lehre', 'ects'); ?>
|
||||
<img src="../../../../skin/images/information.png" title="Summe der positiv absolvierten ECTS" />:</b>
|
||||
<b>
|
||||
<?php echo $this->p->t('lehre', 'ects'); ?>
|
||||
<img src="../../../../skin/images/information.png" title="Summe der positiv absolvierten ECTS" />:
|
||||
</b>
|
||||
<?php echo $courses['overall']['ectssumme_positiv'] ?><br>
|
||||
<br>
|
||||
<?php
|
||||
@@ -54,3 +66,4 @@
|
||||
</body>
|
||||
|
||||
<?php $this->load->view('templates/FHC-Footer'); ?>
|
||||
|
||||
|
||||
@@ -63,4 +63,4 @@
|
||||
$filterWidgetArray['filter_id'] = $this->input->get('filter_id');
|
||||
|
||||
echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
|
||||
?>
|
||||
|
||||
|
||||
@@ -1,110 +1,110 @@
|
||||
<?php
|
||||
$this->load->view(
|
||||
'templates/FHC-Header',
|
||||
array(
|
||||
'title' => 'InfocenterDetails',
|
||||
'jquery3' => true,
|
||||
'bootstrap3' => true,
|
||||
'fontawesome4' => true,
|
||||
'jqueryui1' => true,
|
||||
'dialoglib' => true,
|
||||
'ajaxlib' => true,
|
||||
'udfs' => true,
|
||||
'widgets' => true,
|
||||
'sbadmintemplate3' => true,
|
||||
'customCSSs' => array(
|
||||
'public/css/sbadmin2/admintemplate.css'
|
||||
),
|
||||
'customJSs' => array(
|
||||
'public/js/bootstrapper.js'
|
||||
)
|
||||
)
|
||||
);
|
||||
?>
|
||||
|
||||
<body style="background-color: #eff0f1;">
|
||||
|
||||
<div class="div-table">
|
||||
<div class="div-row">
|
||||
<div class="div-cell" style="font-size: 20px; font-weight: bold;">
|
||||
Zusatzfelder
|
||||
</div>
|
||||
</div>
|
||||
<div class="div-row">
|
||||
<div class="div-cell">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="div-row">
|
||||
<?php
|
||||
if (isset($personUdfs))
|
||||
{
|
||||
?>
|
||||
<div class="div-cell">
|
||||
<?php
|
||||
echo $this->udflib->UDFWidget(
|
||||
array(
|
||||
UDFLib::UDF_UNIQUE_ID => 'fasPersonUDFs',
|
||||
UDFLib::SCHEMA_ARG_NAME => 'public',
|
||||
UDFLib::TABLE_ARG_NAME => 'tbl_person',
|
||||
UDFLib::PRIMARY_KEY_NAME => 'person_id',
|
||||
UDFLib::PRIMARY_KEY_VALUE => $person_id,
|
||||
UDFLib::UDFS_ARG_NAME => $personUdfs
|
||||
)
|
||||
);
|
||||
?>
|
||||
</div>
|
||||
<div class="div-cell" style="width: 40px;">
|
||||
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
if (isset($prestudentUdfs))
|
||||
{
|
||||
?>
|
||||
<div class="div-cell">
|
||||
<?php
|
||||
echo $this->udflib->UDFWidget(
|
||||
array(
|
||||
UDFLib::UDF_UNIQUE_ID => 'fasPrestudentUDFs',
|
||||
UDFLib::SCHEMA_ARG_NAME => 'public',
|
||||
UDFLib::TABLE_ARG_NAME => 'tbl_prestudent',
|
||||
UDFLib::PRIMARY_KEY_NAME => 'prestudent_id',
|
||||
UDFLib::PRIMARY_KEY_VALUE => $prestudent_id,
|
||||
UDFLib::UDFS_ARG_NAME => $prestudentUdfs
|
||||
)
|
||||
);
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<div class="div-row">
|
||||
<div class="div-cell">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="div-row halign-right">
|
||||
<?php
|
||||
if (isset($personUdfs) && isset($prestudentUdfs))
|
||||
{
|
||||
?>
|
||||
<div class="div-cell">
|
||||
|
||||
</div>
|
||||
<div class="div-cell">
|
||||
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
<?php $this->load->view("templates/footer"); ?>
|
||||
|
||||
<?php
|
||||
$this->load->view(
|
||||
'templates/FHC-Header',
|
||||
array(
|
||||
'title' => 'InfocenterDetails',
|
||||
'jquery3' => true,
|
||||
'bootstrap3' => true,
|
||||
'fontawesome4' => true,
|
||||
'jqueryui1' => true,
|
||||
'dialoglib' => true,
|
||||
'ajaxlib' => true,
|
||||
'udfs' => true,
|
||||
'widgets' => true,
|
||||
'sbadmintemplate3' => true,
|
||||
'customCSSs' => array(
|
||||
'public/css/sbadmin2/admintemplate.css'
|
||||
),
|
||||
'customJSs' => array(
|
||||
'public/js/bootstrapper.js'
|
||||
)
|
||||
)
|
||||
);
|
||||
?>
|
||||
|
||||
<body style="background-color: #eff0f1;">
|
||||
|
||||
<div class="div-table">
|
||||
<div class="div-row">
|
||||
<div class="div-cell" style="font-size: 20px; font-weight: bold;">
|
||||
Zusatzfelder
|
||||
</div>
|
||||
</div>
|
||||
<div class="div-row">
|
||||
<div class="div-cell">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="div-row">
|
||||
<?php
|
||||
if (isset($personUdfs))
|
||||
{
|
||||
?>
|
||||
<div class="div-cell">
|
||||
<?php
|
||||
echo $this->udflib->UDFWidget(
|
||||
array(
|
||||
UDFLib::UDF_UNIQUE_ID => 'fasPersonUDFs',
|
||||
UDFLib::SCHEMA_ARG_NAME => 'public',
|
||||
UDFLib::TABLE_ARG_NAME => 'tbl_person',
|
||||
UDFLib::PRIMARY_KEY_NAME => 'person_id',
|
||||
UDFLib::PRIMARY_KEY_VALUE => $person_id,
|
||||
UDFLib::UDFS_ARG_NAME => $personUdfs
|
||||
)
|
||||
);
|
||||
?>
|
||||
</div>
|
||||
<div class="div-cell" style="width: 40px;">
|
||||
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
if (isset($prestudentUdfs))
|
||||
{
|
||||
?>
|
||||
<div class="div-cell">
|
||||
<?php
|
||||
echo $this->udflib->UDFWidget(
|
||||
array(
|
||||
UDFLib::UDF_UNIQUE_ID => 'fasPrestudentUDFs',
|
||||
UDFLib::SCHEMA_ARG_NAME => 'public',
|
||||
UDFLib::TABLE_ARG_NAME => 'tbl_prestudent',
|
||||
UDFLib::PRIMARY_KEY_NAME => 'prestudent_id',
|
||||
UDFLib::PRIMARY_KEY_VALUE => $prestudent_id,
|
||||
UDFLib::UDFS_ARG_NAME => $prestudentUdfs
|
||||
)
|
||||
);
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<div class="div-row">
|
||||
<div class="div-cell">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="div-row halign-right">
|
||||
<?php
|
||||
if (isset($personUdfs) && isset($prestudentUdfs))
|
||||
{
|
||||
?>
|
||||
<div class="div-cell">
|
||||
|
||||
</div>
|
||||
<div class="div-cell">
|
||||
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
<?php $this->load->view("templates/footer"); ?>
|
||||
|
||||
|
||||
@@ -129,15 +129,11 @@
|
||||
<button type="button" class="btn btn-default zgvAblehnen" id="zgvAblehnen_<?php echo $prestudent_id ?>">
|
||||
<?php echo $this->p->t('infocenter', 'zgvNichtErfuellt') ?>
|
||||
</button>
|
||||
<?php
|
||||
if ($studiengang_typ === 'm') :
|
||||
?>
|
||||
<?php if ($studiengang_typ === 'm') : ?>
|
||||
<button type="button" class="btn btn-default zgvAkzeptierenPruefung" id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>">
|
||||
<?php echo $this->p->t('infocenter', 'zgvErfuelltPruefung') ?>
|
||||
</button>
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
<?php endif; ?>
|
||||
<span class="zgvStatusText" id="zgvStatusText_<?php echo $prestudent_id ?>" data-info="need">
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -17,7 +17,11 @@ $this->load->view(
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h3 class="page-header"><?php echo $this->p->t('infocenter', 'zugangsvoraussetzungen'); ?> <?php echo $studiengang_kurzbz; ?> - <?php echo $studiengang_bezeichnung; ?></h3>
|
||||
<h3 class="page-header">
|
||||
<?php echo $this->p->t('infocenter', 'zugangsvoraussetzungen'); ?>
|
||||
<?php echo $studiengang_kurzbz; ?> -
|
||||
<?php echo $studiengang_bezeichnung; ?>
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
<div id="data">
|
||||
@@ -35,3 +39,4 @@ $this->load->view(
|
||||
</body>
|
||||
|
||||
<?php $this->load->view('templates/FHC-Footer'); ?>
|
||||
|
||||
|
||||
@@ -160,7 +160,10 @@
|
||||
<?php
|
||||
echo $this->widgetlib->widget(
|
||||
'Dropdown_widget',
|
||||
array('elements' => success($recipientsArray), 'emptyElement' => ucfirst($this->p->t('global', 'empfaenger')).'...'),
|
||||
array(
|
||||
'elements' => success($recipientsArray),
|
||||
'emptyElement' => ucfirst($this->p->t('global', 'empfaenger')).'...'
|
||||
),
|
||||
array(
|
||||
'name' => 'recipients[]',
|
||||
'id' => 'recipients'
|
||||
|
||||
Reference in New Issue
Block a user