diff --git a/CHANGELOG.md b/CHANGELOG.md index 73a56f5dd..9e0ba7e95 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,11 @@ - **[FAS]** Bei Statuswechsel von Studierenden können Gründe für den Statuswechsel angegeben werden - **[ADDONS]** Addons können Menüpunkte im Vilesci anpassen - **[ADDONS]** Addons können Noten für die Gesamtnote vorschlagen +- **[CORE]** UserDefinedFields ### CHANGED - **[CORE]** Berechtigungsprüfung wurde angepasst damit deaktivierte Benutzer keine Berechtigungen mehr haben +- **[FAS]** Mitarbeiterexport exportiert jetzt nur noch die markierten Personen ### Updateinfo - **[CORE]** Infoscreen wurde umbenannt (informationsbildschirm.php) diff --git a/application/controllers/api/v1/Test.php b/application/controllers/api/v1/Test.php index 1b4dc5c82..fd1896560 100644 --- a/application/controllers/api/v1/Test.php +++ b/application/controllers/api/v1/Test.php @@ -2,8 +2,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); -//require_once APPPATH . '/libraries/REST_Controller.php'; - /** * Testing class for REST calls and authentication */ @@ -16,37 +14,17 @@ class Test extends APIv1_Controller /** * Test HTTP GET method - * It responses whith the HTTP status 200 and prints this JSON string - * {"success":true,"message":"API HTTP GET call test succeed"} - * - * @return void */ public function getTest() { - $payload = [ - 'success' => TRUE, - 'message' => 'API HTTP GET call test succeed', - 'error' => 0 - ]; - $httpstatus = REST_Controller::HTTP_OK; - $this->response($payload, $httpstatus); + $this->response(success('API HTTP GET call test succeed'), REST_Controller::HTTP_OK); } - + /** * Test HTTP POST method - * * It responses whith the HTTP status 200 and prints this JSON string - * {"success":true,"message":"API HTTP POST call test succeed"} - * - * @return void */ public function postTest() { - $payload = [ - 'success' => TRUE, - 'message' => 'API HTTP POST call test succeed', - 'error' => 0 - ]; - $httpstatus = REST_Controller::HTTP_OK; - $this->response($payload, $httpstatus); + $this->response(success('API HTTP POST call test succeed'), REST_Controller::HTTP_OK); } } diff --git a/application/core/APIv1_Controller.php b/application/core/APIv1_Controller.php index 76654b559..5303bf02d 100644 --- a/application/core/APIv1_Controller.php +++ b/application/core/APIv1_Controller.php @@ -1,10 +1,13 @@ dbTable)) - return error(FHC_MODEL_ERROR, FHC_NODBTABLE); + // Check class properties + if (is_null($this->dbTable)) return error(FHC_MODEL_ERROR, FHC_NODBTABLE); // Checks rights - if ($isEntitled = $this->_isEntitled(PermissionLib::INSERT_RIGHT)) return $isEntitled; + if (isError($ent = $this->_isEntitled(PermissionLib::INSERT_RIGHT))) return $ent; // If this table has UDF and the validation of them is ok - if ($this->hasUDF() && isError($validate = $this->udflib->manageUDFs($data, $this->dbTable))) return $validate; + if (isError($validate = $this->_manageUDFs($data, $this->dbTable))) return $validate; // DB-INSERT if ($this->db->insert($this->dbTable, $data)) @@ -90,32 +89,9 @@ class DB_Model extends FHC_Model } } else + { return error($this->db->error(), FHC_DB_ERROR); - } - - /** - * Replace Data in DB-Table - * - * @param array $data DataArray for Replacement - * @return array - * - * DEPRECATED: to be updated, not maintained - * - */ - public function replace($data) - { - // Check Class-Attributes - if (is_null($this->dbTable)) - return error(FHC_MODEL_ERROR, FHC_NODBTABLE); - - // Checks rights - if ($isEntitled = $this->_isEntitled(PermissionLib::REPLACE_RIGHT)) return $isEntitled; - - // DB-REPLACE - if ($this->db->replace($this->dbTable, $data)) - return success($this->db->insert_id()); - else - return error($this->db->error(), FHC_DB_ERROR); + } } /** @@ -127,36 +103,42 @@ class DB_Model extends FHC_Model */ public function update($id, $data) { - // Check Class-Attributes - if (is_null($this->dbTable)) - return error(FHC_MODEL_ERROR, FHC_NODBTABLE); - if (is_null($this->pk)) - return error(FHC_MODEL_ERROR, FHC_NOPK); + // Check class properties + if (is_null($this->pk)) return error(FHC_MODEL_ERROR, FHC_NOPK); + if (is_null($this->dbTable)) return error(FHC_MODEL_ERROR, FHC_NODBTABLE); // Checks rights - if ($isEntitled = $this->_isEntitled(PermissionLib::UPDATE_RIGHT)) return $isEntitled; + if (isError($ent = $this->_isEntitled(PermissionLib::UPDATE_RIGHT))) return $ent; // If this table has UDF and the validation of them is ok - if ($this->hasUDF() && isError($validate = $this->udflib->manageUDFs($data, $this->dbTable, $this->getUDFs($id)))) - { - return $validate; - } + if (isError($validate = $this->_manageUDFs($data, $this->dbTable, $id))) return $validate; - // DB-UPDATE - // Check for composite Primary Key + $tmpId = $id; + + // Check for composite Primary Key, prepare the where clause if (is_array($id)) { if (isset($id[0])) - $this->db->where($this->arrayMergeIndex($this->pk, $id)); - else - $this->db->where($id); + { + $tmpId = $this->_arrayCombine($this->pk, $id); + } } else - $this->db->where($this->pk, $id); + { + $tmpId = array($this->pk => $id); + } + + $this->db->where($tmpId); + + // DB-UPDATE if ($this->db->update($this->dbTable, $data)) + { return success($id); + } else + { return error($this->db->error(), FHC_DB_ERROR); + } } /** @@ -167,30 +149,37 @@ class DB_Model extends FHC_Model */ public function delete($id) { - // Check Class-Attributes - if (is_null($this->dbTable)) - return error(FHC_MODEL_ERROR, FHC_NODBTABLE); - if (is_null($this->pk)) - return error(FHC_MODEL_ERROR, FHC_NOPK); + // Check class properties + if (is_null($this->dbTable)) return error(FHC_MODEL_ERROR, FHC_NODBTABLE); + if (is_null($this->pk)) return error(FHC_MODEL_ERROR, FHC_NOPK); // Checks rights - if ($isEntitled = $this->_isEntitled(PermissionLib::DELETE_RIGHT)) return $isEntitled; - - // DB-DELETE + if (isError($ent = $this->_isEntitled(PermissionLib::DELETE_RIGHT))) return $ent; + + $tmpId = $id; + // Check for composite Primary Key if (is_array($id)) { if (isset($id[0])) - $result = $this->db->delete($this->dbTable, $this->arrayMergeIndex($this->pk, $id)); - else - $result = $this->db->delete($this->dbTable, $id); + { + $tmpId = $this->_arrayCombine($this->pk, $id); + } } else - $result = $this->db->delete($this->dbTable, array($this->pk => $id)); - if ($result) + { + $tmpId = array($this->pk => $id); + } + + // DB-DELETE + if ($this->db->delete($this->dbTable, $tmpId)) + { return success($id); + } else + { return error($this->db->error(), FHC_DB_ERROR); + } } /** @@ -201,33 +190,37 @@ class DB_Model extends FHC_Model */ public function load($id = null) { - // Check Class-Attributes - if (is_null($this->dbTable)) - return error(FHC_MODEL_ERROR, FHC_NODBTABLE); - if (is_null($this->pk)) - return error(FHC_MODEL_ERROR, FHC_NOPK); + // Check class properties + if (is_null($this->pk)) return error(FHC_MODEL_ERROR, FHC_NOPK); + if (is_null($this->dbTable)) return error(FHC_MODEL_ERROR, FHC_NODBTABLE); // Checks rights - if ($isEntitled = $this->_isEntitled(PermissionLib::SELECT_RIGHT)) return $isEntitled; + if (isError($ent = $this->_isEntitled(PermissionLib::SELECT_RIGHT))) return $ent; + + $tmpId = $id; - // DB-SELECT // Check for composite Primary Key if (is_array($id)) { if (isset($id[0])) - $result = $this->db->get_where($this->dbTable, $this->arrayMergeIndex($this->pk, $id)); - else - $result = $this->db->get_where($this->dbTable, $id); + { + $tmpId = $this->_arrayCombine($this->pk, $id); + } + } + elseif ($id != null) + { + $tmpId = array($this->pk => $id); } - elseif (empty($id)) - $result = $this->db->get($this->dbTable); - else - $result = $this->db->get_where($this->dbTable, array($this->pk => $id)); - if ($result) + // DB-SELECT + if ($result = $this->db->get_where($this->dbTable, $tmpId)) + { return success($this->_toPhp($result)); + } else + { return error($this->db->error(), FHC_DB_ERROR); + } } /** @@ -237,20 +230,21 @@ class DB_Model extends FHC_Model */ public function loadWhere($where = null) { - // Check Class-Attributes - if (is_null($this->dbTable)) - return error(FHC_MODEL_ERROR, FHC_NODBTABLE); + // Check class properties + if (is_null($this->dbTable)) return error(FHC_MODEL_ERROR, FHC_NODBTABLE); // Checks rights - if ($isEntitled = $this->_isEntitled(PermissionLib::SELECT_RIGHT)) return $isEntitled; + if (isError($ent = $this->_isEntitled(PermissionLib::SELECT_RIGHT))) return $ent; // Execute query - $result = $this->db->get_where($this->dbTable, $where); - - if ($result) + if ($result = $this->db->get_where($this->dbTable, $where)) + { return success($this->_toPhp($result)); + } else + { return error($this->db->error(), FHC_DB_ERROR); + } } /** @@ -267,12 +261,11 @@ class DB_Model extends FHC_Model */ public function loadTree($mainTable, $sideTables, $where = null, $sideTablesAliases = null) { - // Check Class-Attributes - if (is_null($this->dbTable)) - return error(FHC_MODEL_ERROR, FHC_NODBTABLE); + // Check class properties + if (is_null($this->dbTable)) return error(FHC_MODEL_ERROR, FHC_NODBTABLE); // Checks rights - if ($isEntitled = $this->_isEntitled(PermissionLib::SELECT_RIGHT)) return $isEntitled; + if (isError($ent = $this->_isEntitled(PermissionLib::SELECT_RIGHT))) return $ent; // List of tables on which it will work $tables = array_merge(array($mainTable), $sideTables); @@ -302,7 +295,7 @@ class DB_Model extends FHC_Model // To avoid overwriting of the properties within the object returned by CI // will be given an alias to every column, that will be composed with the following schema // . AS _ - $select .= $tables[$t] . '.' . $fields[$f]->column_name . ' AS ' . $tables[$t] . '_' . $fields[$f]->column_name; + $select .= $tables[$t].'.'.$fields[$f]->column_name.' AS '.$tables[$t].'_'.$fields[$f]->column_name; if ($f < count($fields) - 1) $select .= ', '; } @@ -343,7 +336,7 @@ class DB_Model extends FHC_Model foreach (array_slice($objectVars, $tableColumnsCountArrayOffset, $tableColumnsCountArray[$f]) as $key => $value) { - $objTmpArray[$f]->{str_replace($tables[$f] . '_', '', $key)} = $value; + $objTmpArray[$f]->{str_replace($tables[$f].'_', '', $key)} = $value; } $tableColumnsCountArrayOffset += $tableColumnsCountArray[$f]; // Increasing the offset @@ -378,7 +371,7 @@ class DB_Model extends FHC_Model { $returnArray[$k]->{$sideTableProperty} = array($sideTableObj); } - else if (array_search($sideTableObj, $returnArray[$k]->{$sideTableProperty}) === false) + elseif (array_search($sideTableObj, $returnArray[$k]->{$sideTableProperty}) === false) { array_push($returnArray[$k]->{$sideTableProperty}, $sideTableObj); } @@ -425,9 +418,8 @@ class DB_Model extends FHC_Model */ public function addOrder($field = null, $type = 'ASC') { - // Check Class-Attributes and parameters - if (is_null($field) || !in_array($type, array('ASC', 'DESC'))) - return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); + // Check class properties and parameters + if (is_null($field) || !in_array($type, array('ASC', 'DESC'))) return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); $this->db->order_by($field, $type); @@ -441,9 +433,8 @@ class DB_Model extends FHC_Model */ public function addSelect($select, $escape = true) { - // Check Class-Attributes and parameters - if (is_null($select) || $select == '') - return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); + // Check class properties and parameters + if (is_null($select) || $select == '') return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); $this->db->select($select, $escape); @@ -467,9 +458,8 @@ class DB_Model extends FHC_Model */ public function addLimit($start = null, $end = null) { - // Check Class-Attributes and parameters - if (!is_numeric($start) || (is_numeric($start) && $start <= 0)) - return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); + // Check class properties and parameters + if (!is_numeric($start) || (is_numeric($start) && $start <= 0)) return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); if (is_numeric($end) && $end > $start) { @@ -493,12 +483,11 @@ class DB_Model extends FHC_Model $tmpTable = trim($table); // Check parameters - if (empty($tmpTable)) - return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); + if (empty($tmpTable)) return error(FHC_MODEL_ERROR, FHC_MODEL_ERROR); if (!empty($alias)) { - $tmpTable .= ' AS ' . $alias; + $tmpTable .= ' AS '.$alias; } $this->db->from($tmpTable); @@ -562,7 +551,7 @@ class DB_Model extends FHC_Model return true; } // If false - else if ($val == DB_Model::PGSQL_BOOLEAN_FALSE) + elseif ($val == DB_Model::PGSQL_BOOLEAN_FALSE) { return false; } @@ -570,65 +559,11 @@ class DB_Model extends FHC_Model // If it is null, let it be null return $val; } - - /** - * Convert PG-Array to PHP-Array - * - * @param string $s PG-String to convert - * @param string $start start-point for recursive iterations - * @param string $end end-point for recursive iterations - * @return array - */ - public function pgArrayPhp($s, $start=0, &$end=NULL) - { - if (empty($s) || $s[0]!='{') return NULL; - $return = array(); - $br = 0; - $string = false; - $quote=''; - $len = strlen($s); - $v = ''; - for ($i=$start+1; $i<$len;$i++) - { - $ch = $s[$i]; - if (!$string && $ch=='}') - { - if ($v!=='' || !empty($return)) - $return[] = $v; - $end = $i; - break; - } - else - if (!$string && $ch=='{') - $v = $this->pgArrayPhp($s,$i,$i); - else - if (!$string && $ch==',') - { - $return[] = $v; - $v = ''; - } - else - if (!$string && ($ch=='\'' || $ch=='\'')) - { - $string = true; - $quote = $ch; - } - else - if ($string && $ch==$quote && $s[$i-1]=='\\') - $v = substr($v,0,-1).$ch; - else - if ($string && $ch==$quote && $s[$i-1]!='\\') - $string = FALSE; - else - $v .= $ch; - } - return $return; - } /** - * Converts from PostgreSQL array to php array - * It also takes care about array of booleans - */ + * Converts from PostgreSQL array to php array + * It also takes care about array of booleans + */ public function pgsqlArrayToPhpArray($string, $booleans = false) { // At least returns an empty array @@ -696,13 +631,14 @@ class DB_Model extends FHC_Model } /** - * + * Returns all the UDF contained in this table ($dbTable) + * If no UDF are present, an empty array will be returned */ public function getUDFs($id, $udfName = null) { $udfs = array(); - $this->addSelect(UDFLib::COLUMN_NAME); + $this->addSelect(UDFLib::COLUMN_NAME); // select only the column with UDF $result = $this->load($id); if (hasData($result)) @@ -713,12 +649,12 @@ class DB_Model extends FHC_Model { if ($udfName != null && $udfName == $key) { - $udfs[$key] = $value; // + $udfs[$key] = $value; break; } else { - $udfs[$key] = $value; // + $udfs[$key] = $value; } } } @@ -737,22 +673,6 @@ class DB_Model extends FHC_Model // ------------------------------------------------------------------------------------------ // Protected methods - /** - * Invalid ID - * - * @param array $i Array with indexes. - * @param array $v Array with values. - * @return array - */ - protected function arrayMergeIndex($idexes, $values) - { - if (count($idexes) != count($values)) - return false; - for ($j = 0; $j < count($idexes); $j++) - $a[$idexes[$j]] = $values[$j]; - return $a; - } - /** * Executes a query and converts array and boolean data types from PgSql to php * @return: boolean false on failure @@ -803,8 +723,8 @@ class DB_Model extends FHC_Model protected function getSchemaAndTable($schemaAndTable) { $result = new stdClass(); - $result->schema = DB_Model::DEFAULT_SCHEMA; $result->table = $schemaAndTable; + $result->schema = DB_Model::DEFAULT_SCHEMA; // If a schema is specified if (($pos = strpos($schemaAndTable, '.')) !== false) @@ -819,27 +739,66 @@ class DB_Model extends FHC_Model // ------------------------------------------------------------------------------------------ // Private methods + /** + * Invalid ID + * + * @param array $i Array with indexes. + * @param array $v Array with values. + * @return array + */ + private function _arrayCombine($idexes, $values) + { + if (count($idexes) != count($values)) return null; + + return array_combine($idexes, $values); + } + /** * Checks if the caller is entitled to perform this operation with this right */ private function _isEntitled($permission) { + $ent = success(true); + // If the caller is _not_ a model _and_ tries to read data, then avoids to check permissions // Otherwise checks always the permissions - if (($permission == PermissionLib::SELECT_RIGHT && - substr(get_called_class(), -6) == DB_Model::MODEL_POSTFIX) || - $permission != PermissionLib::SELECT_RIGHT) + if (($permission == PermissionLib::SELECT_RIGHT + && substr(get_called_class(), -6) == DB_Model::MODEL_POSTFIX) + || $permission != PermissionLib::SELECT_RIGHT) { + $ent = $this->isEntitled($this->dbTable, $permission, FHC_NORIGHT, FHC_MODEL_ERROR); // If true is not returned, then an error has occurred - if (($isEntitled = $this->isEntitled($this->dbTable, $permission, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) + if (isError($ent)) { // Before returning the object containing the error, reset the build query // This is for preventing that other parts of the query will be built before of the next execution $this->resetQuery(); - - return $isEntitled; } } + + return $ent; + } + + /** + * Wrapper method for UDFLib->manageUDFs + */ + private function _manageUDFs(&$data, $schemaAndTable, $id = null) + { + $manageUDFs = success(true); + + if ($this->hasUDF()) + { + if ($id != null) + { + $manageUDFs = $this->udflib->manageUDFs($data, $this->dbTable, $this->getUDFs($id)); + } + else + { + $manageUDFs = $this->udflib->manageUDFs($data, $this->dbTable); + } + } + + return $manageUDFs; } /** @@ -858,7 +817,7 @@ class DB_Model extends FHC_Model { $toBeConverterdArray = array(); // Fields to be converted $metaDataArray = $result->field_data(); // Fields information - for($i = 0; $i < count($metaDataArray); $i++) // Looking for booleans and arrays + for ($i = 0; $i < count($metaDataArray); $i++) // Looking for booleans and arrays { // If array type, boolean type OR a UDF if (strpos($metaDataArray[$i]->type, DB_Model::PGSQL_ARRAY_TYPE) !== false @@ -882,12 +841,12 @@ class DB_Model extends FHC_Model // Returns the array of objects, each of them represents a DB record $resultsArray = $result->result(); // Looping on results - for($i = 0; $i < count($resultsArray); $i++) + for ($i = 0; $i < count($resultsArray); $i++) { // Single element $resultElement = $resultsArray[$i]; // Looping on fields to be converted - for($j = 0; $j < count($toBeConverterdArray); $j++) + for ($j = 0; $j < count($toBeConverterdArray); $j++) { // Single element $toBeConverted = $toBeConverterdArray[$j]; @@ -901,12 +860,12 @@ class DB_Model extends FHC_Model ); } // Boolean type - else if ($toBeConverted->type == DB_Model::PGSQL_BOOLEAN_TYPE) + elseif ($toBeConverted->type == DB_Model::PGSQL_BOOLEAN_TYPE) { $resultElement->{$toBeConverted->name} = $this->pgBoolPhp($resultElement->{$toBeConverted->name}); } // UDF - else if ($this->udflib->isUDFColumn($toBeConverted->name, $toBeConverted->type)) + elseif ($this->udflib->isUDFColumn($toBeConverted->name, $toBeConverted->type)) { $jsonValues = json_decode($resultElement->{$toBeConverted->name}); // decode UDFs values if ($jsonValues != null) // if decode is ok @@ -964,4 +923,4 @@ class DB_Model extends FHC_Model return $this->execQuery($query, array(strtolower($schema), strtolower($table))); } -} \ No newline at end of file +} diff --git a/application/core/FHC_Controller.php b/application/core/FHC_Controller.php index fcffd7a82..5e252998e 100644 --- a/application/core/FHC_Controller.php +++ b/application/core/FHC_Controller.php @@ -4,10 +4,13 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); class FHC_Controller extends CI_Controller { + /** + * Standard construct for all the controllers, loads the authentication system + */ public function __construct() { parent::__construct(); $this->load->helper('fhcauth'); } -} \ No newline at end of file +} diff --git a/application/core/FHC_Model.php b/application/core/FHC_Model.php index a63411475..dbd556dd5 100644 --- a/application/core/FHC_Model.php +++ b/application/core/FHC_Model.php @@ -4,7 +4,12 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); class FHC_Model extends CI_Model { - function __construct() + /** + * Standard constructor for all the models + * It loads the helper message to manage the values returned by methods + * It loads the permission library + */ + public function __construct() { parent::__construct(); @@ -25,19 +30,20 @@ class FHC_Model extends CI_Model */ public function isEntitled($sourceName, $accessType, $languageMessageCode, $msgErrorCode) { + $isEntitled = success(true); + if ($this->permissionlib->isEntitled($sourceName, $accessType) === false) { $retval = sprintf( '%s -> %s:%s', - lang('fhc_' . $languageMessageCode), + lang('fhc_'.$languageMessageCode), $this->permissionlib->getBerechtigungKurzbz($sourceName), $accessType ); - return error($retval, $msgErrorCode); - } - else - { - return true; + + $isEntitled = error($retval, $msgErrorCode); } + + return $isEntitled; } -} \ No newline at end of file +} diff --git a/application/core/FS_Model.php b/application/core/FS_Model.php index c79360e9f..8b006e91a 100644 --- a/application/core/FS_Model.php +++ b/application/core/FS_Model.php @@ -3,9 +3,11 @@ class FS_Model extends FHC_Model { protected $filepath; // Path of the file - protected $acl; // Name of the permissions array index for FS writing, reading... - - function __construct($filepath = null) + + /** + * Loads FilesystemLib and set properties + */ + public function __construct($filepath = null) { parent::__construct(); @@ -26,16 +28,13 @@ class FS_Model extends FHC_Model public function read($filename) { // Check Class-Attributes - if (is_null($this->filepath)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check method parameters - if (is_null($filename)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check rights - if (($chkRights = $this->isEntitled($this->filepath, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $chkRights; + if (isError($ent = $this->isEntitled($this->filepath, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; if (!is_null($data = $this->filesystemlib->read($this->filepath, $filename))) { @@ -56,18 +55,14 @@ class FS_Model extends FHC_Model public function write($filename, $content) { // Check Class-Attributes - if (is_null($this->filepath)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check method parameters - if (is_null($filename)) - return error(FHC_MODEL_ERROR, FHC_ERROR); - if (is_null($content)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($content)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check rights - if (($chkRights = $this->isEntitled($this->filepath, PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $chkRights; + if (isError(($ent = $this->isEntitled($this->filepath, PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)))) return $ent; if ($this->filesystemlib->write($this->filepath, $filename, base64_decode($content)) === true) { @@ -88,18 +83,14 @@ class FS_Model extends FHC_Model public function append($filename, $content) { // Check Class-Attributes - if (is_null($this->filepath)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check method parameters - if (is_null($filename)) - return error(FHC_MODEL_ERROR, FHC_ERROR); - if (is_null($content)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($content)) return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check rights - if (($chkRights = $this->isEntitled($this->filepath, PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $chkRights; + if (isError($ent = $this->isEntitled($this->filepath, PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; if ($this->filesystemlib->append($this->filepath, $filename, base64_decode($content)) === true) { @@ -120,16 +111,13 @@ class FS_Model extends FHC_Model public function remove($filename) { // Check Class-Attributes - if (is_null($this->filepath)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check method parameters - if (is_null($filename)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check rights - if (($chkRights = $this->isEntitled($this->filepath, PermissionLib::DELETE_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $chkRights; + if (isError($ent = $this->isEntitled($this->filepath, PermissionLib::DELETE_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; if ($this->filesystemlib->remove($this->filepath, $filename) === true) { @@ -150,18 +138,14 @@ class FS_Model extends FHC_Model public function rename($filename, $newFilename) { // Check Class-Attributes - if (is_null($this->filepath)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($this->filepath)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check method parameters - if (is_null($filename)) - return error(FHC_MODEL_ERROR, FHC_ERROR); - if (is_null($newFilename)) - return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($filename)) return error(FHC_MODEL_ERROR, FHC_ERROR); + if (is_null($newFilename)) return error(FHC_MODEL_ERROR, FHC_ERROR); // Check rights - if (($chkRights = $this->isEntitled($this->filepath, PermissionLib::UPDATE_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $chkRights; + if (isError($ent = $this->isEntitled($this->filepath, PermissionLib::UPDATE_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; if ($this->filesystemlib->rename($this->filepath, $filename, $this->filepath, $newFilename) === true) { @@ -172,4 +156,4 @@ class FS_Model extends FHC_Model return error(FHC_MODEL_ERROR, FHC_ERROR); } } -} \ No newline at end of file +} diff --git a/application/core/VileSci_Controller.php b/application/core/VileSci_Controller.php index 4eaa733a1..cc2979d39 100644 --- a/application/core/VileSci_Controller.php +++ b/application/core/VileSci_Controller.php @@ -4,7 +4,10 @@ if (! defined("BASEPATH")) exit("No direct script access allowed"); class VileSci_Controller extends FHC_Controller { - function __construct() + /** + * Standard construct for all the controllers used in VileSci + */ + public function __construct() { parent::__construct(); } diff --git a/application/libraries/CallerLib.php b/application/libraries/CallerLib.php index 219a871d3..856f0855a 100644 --- a/application/libraries/CallerLib.php +++ b/application/libraries/CallerLib.php @@ -79,7 +79,7 @@ class CallerLib } } // If the given resource is a library - else if (strpos($parameters->resourceName, CallerLib::LIB_PREFIX) !== false) + elseif (strpos($parameters->resourceName, CallerLib::LIB_PREFIX) !== false) { // Check if the resource is already loaded, it works only with libraries and drivers $isLoaded = $this->ci->load->is_loaded($parameters->resourceName); @@ -89,10 +89,10 @@ class CallerLib // Checks if the operation is permitted by the API caller // Only for libraries, permissions are automatically handled by models $result = $this->checkLibraryPermission( - $parameters->resourcePath, - $parameters->resourceName, - $parameters->function, - $permissionType + $parameters->resourcePath, + $parameters->resourceName, + $parameters->function, + $permissionType ); if (isError($result)) { @@ -117,7 +117,7 @@ class CallerLib // Wrong selection! else { - $result = error('Neither a lib nor model: ' . $parameters->resourcePath . $parameters->resourceName); + $result = error('Neither a lib nor model: '.$parameters->resourcePath.$parameters->resourceName); } // If the resource was found and loaded @@ -166,7 +166,7 @@ class CallerLib $parameters->resourcePath = str_replace($parameters->resourceName, '', $parameterValue); } // The name of the function - else if ($parameterName == CallerLib::FUNCTION_PARAMETER) + elseif ($parameterName == CallerLib::FUNCTION_PARAMETER) { $parameters->function = $parameterValue; } @@ -217,7 +217,7 @@ class CallerLib /** * Loads a model using the given path and name - * + * * NOTE: the models automatically handle the permissions */ private function _loadModel($resourcePath, $resourceName) @@ -227,12 +227,12 @@ class CallerLib try { - $loaded = $this->ci->load->model($resourcePath . $resourceName); + $loaded = $this->ci->load->model($resourcePath.$resourceName); } catch (Exception $e) { // Errors while loading the model - $result = error('Errors while loading the model: ' . $e->getMessage()); + $result = error('Errors while loading the model: '.$e->getMessage()); } if (!is_null($loaded)) @@ -257,7 +257,7 @@ class CallerLib $permissionPath = $resourcePath; } - $permissionPath .= $resourceName . '.' . $function; + $permissionPath .= $resourceName.'.'.$function; if ($this->ci->permissionlib->isEntitled($permissionPath, $permissionType) === false) { @@ -273,14 +273,14 @@ class CallerLib /** * Loads a library using the given path and name - * + * * The method 'library' of the class CI_Loader provided by CI has some limitations, * so to be able to check errors was used a workaround. * It consists in: * - Checking if the file (identified by parameters $resourcePath and $resourceName) exists * - If exists it will be loaded using the method 'file' from CI_Loader * - Checks if the loaded file contains a class identified by parameter $resourceName - * + * * If one of the previous tests fails, it will be returned a null value */ private function _loadLibrary($resourcePath, $resourceName) @@ -295,8 +295,8 @@ class CallerLib $found = null; for ($i = 0; $i < count($packagePaths) && is_null($found); $i++) { - $file = $packagePaths[$i] . CallerLib::LIBS_PATH . DIRECTORY_SEPARATOR . - $resourcePath . $resourceName . CallerLib::LIB_FILE_EXTENSION; + $file = $packagePaths[$i].CallerLib::LIBS_PATH.DIRECTORY_SEPARATOR. + $resourcePath.$resourceName.CallerLib::LIB_FILE_EXTENSION; if (file_exists($file)) { $found = $file; @@ -313,20 +313,20 @@ class CallerLib { $loaded = null; // Same phrase error as load->model() provided by CI - $result = error($found . ' exists, but doesn\'t declare class ' . $resourceName); + $result = error($found.' exists, but doesn\'t declare class '.$resourceName); } } else { $loaded = null; // Same phrase error as load->model() provided by CI - $result = error('Unable to load the requested class: ' . $resourceName); + $result = error('Unable to load the requested class: '.$resourceName); } } catch (Exception $e) { // Errors while loading the library - $result = error('Errors while loading the library: ' . $e->getMessage()); + $result = error('Errors while loading the library: '.$e->getMessage()); } if (!is_null($loaded)) @@ -339,7 +339,7 @@ class CallerLib /** * Calls a method of a class with the given parameters and returns its result - * + * * @param string $resourceName identifies the class name * @param string $function identifies the method name * @param array $parameters contains the parameters to be passed to the method @@ -359,7 +359,7 @@ class CallerLib // If the function is static if ($reflectionMethod->isStatic() === true) { - $classMethod = $resourceName . '::' . $function; + $classMethod = $resourceName.'::'.$function; } // If the function is not static else @@ -370,7 +370,6 @@ class CallerLib // If the resource's function is callable if (is_callable($classMethod)) { - // Call resource->function() // @ was applied to prevent really ugly and unmanageable errors $resultCall = @call_user_func_array($classMethod, $parameters); @@ -379,7 +378,7 @@ class CallerLib // it will be recognized like a running error. A little bit tricky ;) if ($resultCall === false) { - $result = error('Error running ' . $resourceName . '->' . $function . '()'); + $result = error('Error running '.$resourceName.'->'.$function.'()'); } // Returns the result of resource->function() else @@ -389,14 +388,13 @@ class CallerLib } else { - $result = error($resourceName . '->' . $function . '() is not callable!'); + $result = error($resourceName.'->'.$function.'() is not callable!'); } } else { $result = error( - 'Number of required parameters: ' . $reflectionMethod->getNumberOfRequiredParameters() . - '. Given: ' . count($parameters) + 'Number of required parameters: '.$reflectionMethod->getNumberOfRequiredParameters().'. Given: '.count($parameters) ); } } @@ -407,4 +405,4 @@ class CallerLib return $result; } -} \ No newline at end of file +} diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php index a4b82ef12..7ee160f85 100644 --- a/application/libraries/DmsLib.php +++ b/application/libraries/DmsLib.php @@ -2,12 +2,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); -/** - * - */ class DmsLib { - // const FILE_CONTENT_PROPERTY = 'file_content'; /** @@ -27,7 +23,7 @@ class DmsLib } /** - * + * read */ public function read($dms_id, $version = null) { @@ -66,7 +62,7 @@ class DmsLib } /** - * + * getAktenAcceptedDms */ public function getAktenAcceptedDms($person_id, $dokument_kurzbz = null, $no_file = null) { @@ -92,13 +88,13 @@ class DmsLib } /** - * + * save */ public function save($dms) { $result = null; - if(isset($dms['new']) && $dms['new'] == true) + if (isset($dms['new']) && $dms['new'] == true) { // Remove new parameter to avoid DB insert errors unset($dms['new']); @@ -107,7 +103,7 @@ class DmsLib if (isSuccess($result)) { $filename = $result->retval; - if(isset($dms['dms_id']) && $dms['dms_id'] != '') + if (isset($dms['dms_id']) && $dms['dms_id'] != '') { $result = $this->ci->DmsVersionModel->insert( $this->ci->DmsVersionModel->filterFields($dms, $dms['dms_id'], $filename) @@ -148,7 +144,7 @@ class DmsLib } /** - * + * delete */ public function delete($person_id, $dms_id) { @@ -218,11 +214,11 @@ class DmsLib } /** - * + * _saveFileOnInsert */ private function _saveFileOnInsert($dms) { - $filename = uniqid() . '.' . pathinfo($dms['name'], PATHINFO_EXTENSION); + $filename = uniqid().'.'.pathinfo($dms['name'], PATHINFO_EXTENSION); $result = $this->ci->DmsFSModel->write($filename, $dms['file_content']); if (isSuccess($result)) @@ -234,13 +230,13 @@ class DmsLib } /** - * + * _saveFileOnUpdate */ private function _saveFileOnUpdate($dms) { $result = null; - if(isset($dms['version'])) + if (isset($dms['version'])) { $result = $this->read($dms['dms_id'], $dms['version']); @@ -252,4 +248,4 @@ class DmsLib return $result; } -} \ No newline at end of file +} diff --git a/application/libraries/FHC_Auth.php b/application/libraries/FHC_Auth.php index a56cf0237..dd7bb09e2 100644 --- a/application/libraries/FHC_Auth.php +++ b/application/libraries/FHC_Auth.php @@ -10,10 +10,6 @@ * @since Version 1.0.0 * @filesource */ -if (! defined('BASEPATH')) exit('No direct script access allowed'); - -require_once FHCPATH.'include/authentication.class.php'; -require_once FHCPATH.'include/AddonAuthentication.php'; /** * FHC-Auth Helpers @@ -25,7 +21,10 @@ require_once FHCPATH.'include/AddonAuthentication.php'; * @link http://fhcomplete.org/user_guide/helpers/fhcauth_helper.html */ -// ------------------------------------------------------------------------ +if (! defined('BASEPATH')) exit('No direct script access allowed'); + +require_once FHCPATH.'include/authentication.class.php'; +require_once FHCPATH.'include/AddonAuthentication.php'; class FHC_Auth extends authentication { @@ -39,10 +38,6 @@ class FHC_Auth extends authentication /** * Auth Username, Password over FH-Complete - * - * @param string $username - * @param string $password - * @return bool */ public function basicAuthentication($username, $password) { @@ -57,9 +52,9 @@ class FHC_Auth extends authentication } /** - * + * * TO BE UPDATED - * + * * Get the md5 hashed password by the addon username * * @param string $username addon username @@ -71,4 +66,4 @@ class FHC_Auth extends authentication return md5($aam->getPasswordByUsername($username)); } -} \ No newline at end of file +} diff --git a/application/libraries/FilesystemLib.php b/application/libraries/FilesystemLib.php index 0b1dbc5d0..c940acede 100644 --- a/application/libraries/FilesystemLib.php +++ b/application/libraries/FilesystemLib.php @@ -1,5 +1,5 @@ checkParameters($filepath, $filename)) { - $resource = $filepath . DIRECTORY_SEPARATOR . $filename; + $resource = $filepath.DIRECTORY_SEPARATOR.$filename; if (file_exists($resource) && $fileHandle = fopen($resource, 'r')) { $result = ''; @@ -61,8 +55,8 @@ class FilesystemLib return $result; } - /* - * + /** + * write */ public function write($filepath, $filename, $content) { @@ -70,7 +64,7 @@ class FilesystemLib if ($this->checkParameters($filepath, $filename) && isset($content)) { - $resource = $filepath . DIRECTORY_SEPARATOR . $filename; + $resource = $filepath.DIRECTORY_SEPARATOR.$filename; if (is_writable($filepath) && $fileHandle = fopen($resource, 'w')) { if (fwrite($fileHandle, $content) !== false) @@ -84,8 +78,8 @@ class FilesystemLib return $result; } - /* - * + /** + * append */ public function append($filepath, $filename, $content) { @@ -93,7 +87,7 @@ class FilesystemLib if ($this->checkParameters($filepath, $filename) && isset($content)) { - $resource = $filepath . DIRECTORY_SEPARATOR . $filename; + $resource = $filepath.DIRECTORY_SEPARATOR.$filename; if (is_writable($resource) && $fileHandle = fopen($resource, 'a')) { if (fwrite($fileHandle, $content) !== false) @@ -107,8 +101,8 @@ class FilesystemLib return $result; } - /* - * + /** + * remove */ public function remove($filepath, $filename) { @@ -118,7 +112,7 @@ class FilesystemLib { if (is_writable($filepath)) { - $resource = $filepath . DIRECTORY_SEPARATOR . $filename; + $resource = $filepath.DIRECTORY_SEPARATOR.$filename; $result = unlink($resource); } } @@ -126,8 +120,8 @@ class FilesystemLib return $result; } - /* - * + /** + * rename */ public function rename($filepath, $filename, $newFilepath, $newFilename) { @@ -135,14 +129,14 @@ class FilesystemLib if ($this->checkParameters($filepath, $filename) && $this->checkParameters($newFilepath, $newFilename)) { - $resource = $filepath . DIRECTORY_SEPARATOR . $filename; + $resource = $filepath.DIRECTORY_SEPARATOR.$filename; if (is_writable($filepath) && is_writable($newFilepath) && file_exists($resource)) { - $destination = $newFilepath . DIRECTORY_SEPARATOR . $newFilename; + $destination = $newFilepath.DIRECTORY_SEPARATOR.$newFilename; $result = rename($resource, $destination); } } return $result; } -} \ No newline at end of file +} diff --git a/application/libraries/LogLib.php b/application/libraries/LogLib.php index f104d6e99..be401f208 100644 --- a/application/libraries/LogLib.php +++ b/application/libraries/LogLib.php @@ -17,24 +17,25 @@ class LogLib const LINE_SEPARATOR = ':'; /** - * Object initialization + * format */ - public function __construct() {} - private function format($class, $function, $line) { $formatted = LogLib::CALLER_PREFIX; if (!is_null($class) && $class != '') { - $formatted .= $class . LogLib::CLASS_POSTFIX; + $formatted .= $class.LogLib::CLASS_POSTFIX; } - $formatted .= $function . LogLib::LINE_SEPARATOR . $line . LogLib::CALLER_POSTFIX . ' '; + $formatted .= $function.LogLib::LINE_SEPARATOR.$line.LogLib::CALLER_POSTFIX.' '; return $formatted; } + /** + * getCaller + */ private function getCaller() { $classIndex = 3; @@ -62,13 +63,16 @@ class LogLib return $this->format($class, $function, $line); } + /** + * log + */ private function log($level, $message) { - log_message($level, $this->getCaller() . $message); + log_message($level, $this->getCaller().$message); } /** - * + * logDebug */ public function logDebug($message) { @@ -76,7 +80,7 @@ class LogLib } /** - * + * logInfo */ public function logInfo($message) { @@ -84,10 +88,10 @@ class LogLib } /** - * + * logError */ public function logError($message) { $this->log(LogLib::ERROR, $message); } -} \ No newline at end of file +} diff --git a/application/libraries/MailLib.php b/application/libraries/MailLib.php index ee2fa9419..5c7093461 100755 --- a/application/libraries/MailLib.php +++ b/application/libraries/MailLib.php @@ -1,6 +1,6 @@ ci =& get_instance(); // The second parameter is used to avoiding name collisions in the config array - $this->ci->config->load("mail", true); + $this->ci->config->load('mail', true); // CI Email library - $this->ci->load->library("email"); + $this->ci->load->library('email'); // Initializing email library with the loaded configurations - $this->ci->email->initialize($this->ci->config->config["mail"]); + $this->ci->email->initialize($this->ci->config->config['mail']); // Set the configuration properties with the standard configuration values - $this->email_number_to_sent = $this->getEmailCfgItem("email_number_to_sent"); - $this->email_number_per_time_range = $this->getEmailCfgItem("email_number_per_time_range"); - $this->email_time_range = $this->getEmailCfgItem("email_time_range"); - $this->email_from_system = $this->getEmailCfgItem("email_from_system"); - $this->alias_from_system = $this->getEmailCfgItem("alias_from_system"); + $this->email_number_to_sent = $this->getEmailCfgItem('email_number_to_sent'); + $this->email_number_per_time_range = $this->getEmailCfgItem('email_number_per_time_range'); + $this->email_time_range = $this->getEmailCfgItem('email_time_range'); + $this->email_from_system = $this->getEmailCfgItem('email_from_system'); + $this->alias_from_system = $this->getEmailCfgItem('alias_from_system'); } /** * Sends a single email */ - public function send($from, $to, $subject, $message, $alias = "", $cc = null, $bcc = null, $altMessage = '') + public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '') { // If from is not specified then use the standard one - if (is_null($from) || $from == "") + if (is_null($from) || $from == '') { $from = $this->email_from_system; // If alias is not specified then use the standard one - if (is_null($alias) || $alias == "") + if (is_null($alias) || $alias == '') { $alias = $this->alias_from_system; } diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php index cbcb6863a..3b18874eb 100755 --- a/application/libraries/MessageLib.php +++ b/application/libraries/MessageLib.php @@ -3,12 +3,15 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); /** -* Messaging Library for FH-Complete -*/ + * Messaging Library for FH-Complete + */ class MessageLib { const MSG_INDX_PREFIX = 'message_'; + /** + * Constructor + */ public function __construct() { // Get code igniter instance @@ -43,10 +46,6 @@ class MessageLib /** * getMessage() - returns the spicified received message for a specified person - * - * @param string $msg_id REQUIRED - * @param string $person_id REQUIRED - * @return object */ public function getMessage($msg_id, $person_id) { @@ -62,9 +61,6 @@ class MessageLib /** * getMessagesByUID() - will return all messages, including the latest status for specified user. It don´t returns Attachments. - * - * @param string $uid REQUIRED - * @return array */ public function getMessagesByUID($uid, $all = false) { @@ -78,9 +74,6 @@ class MessageLib /** * getMessagesByPerson() - will return all messages, including the latest status for specified user. It don´t returns Attachments. - * - * @param bigint $person_id REQUIRED - * @return array */ public function getMessagesByPerson($person_id, $all = false) { @@ -94,9 +87,6 @@ class MessageLib /** * getSentMessagesByPerson() - Get all sent messages from a person identified by person_id - * - * @param bigint $person_id REQUIRED - * @return array */ public function getSentMessagesByPerson($person_id, $all = false) { @@ -110,9 +100,6 @@ class MessageLib /** * getMessageByToken - * - * @param token string - * @return array */ public function getMessageByToken($token) { @@ -156,9 +143,6 @@ class MessageLib /** * getCountUnreadMessages - * - * @param bigint $person_id REQUIRED - * @return array */ public function getCountUnreadMessages($person_id) { @@ -172,11 +156,6 @@ class MessageLib /** * updateMessageStatus() - will change status on message for particular user - * - * @param integer $msg_id REQUIRED - * @param integer $user_id REQUIRED - * @param integer $status_id REQUIRED - should come from config/message.php list of constants - * @return array */ public function updateMessageStatus($message_id, $person_id, $status) { @@ -219,7 +198,6 @@ class MessageLib /** * sendMessage() - sends new internal message. This function will create a new thread - * */ public function sendMessage($sender_id, $receiver_id, $subject, $body, $priority = PRIORITY_NORMAL, $relationmessage_id = null, $oe_kurzbz = null, $multiPartMime = true) { @@ -270,7 +248,7 @@ class MessageLib $result = $this->_error('', MSG_ERR_SUBJECT_EMPTY); break; } - else if (empty($body)) + elseif (empty($body)) { $result = $this->_error('', MSG_ERR_BODY_EMPTY); break; @@ -295,13 +273,6 @@ class MessageLib /** * sendMessageVorlage() - sends new internal message using a template - * - * @param integer $sender_id REQUIRED - * @param mixed $recipients REQUIRED - a single integer or an array of integers, representing user_ids - * @param string $subject - * @param string $body - * @param integer $priority - * @return array */ public function sendMessageVorlage($sender_id, $receiver_id, $vorlage_kurzbz, $oe_kurzbz, $data, $relationmessage_id = null, $orgform_kurzbz = null, $multiPartMime = true) { @@ -375,19 +346,19 @@ class MessageLib $result = $this->_error('', MSG_ERR_TEMPLATE_NOT_FOUND); break; } - else if (is_array($result->retval) && count($result->retval) > 0) + elseif (is_array($result->retval) && count($result->retval) > 0) { if (is_null($result->retval[0]->oe_kurzbz)) { $result = $this->_error('', MSG_ERR_TEMPLATE_NOT_FOUND); break; } - else if (empty($result->retval[0]->text)) + elseif (empty($result->retval[0]->text)) { $result = $this->_error('', MSG_ERR_INVALID_TEMPLATE); break; } - else if (empty($result->retval[0]->subject)) + elseif (empty($result->retval[0]->subject)) { $result = $this->_error('', MSG_ERR_INVALID_TEMPLATE); break; @@ -451,9 +422,10 @@ class MessageLib for ($i = 0; $i < count($result->retval) && $sent; $i++) { // If the person has an email account - if (!is_null($result->retval[$i]->receiver) && $result->retval[$i]->receiver != '') + if ((!is_null($result->retval[$i]->receiver) && $result->retval[$i]->receiver != '') + || (!is_null($result->retval[$i]->employeecontact) && $result->retval[$i]->employeecontact != '')) { - $href = $this->ci->config->item('message_server') . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token; + $href = $this->ci->config->item('message_server').$this->ci->config->item('message_html_view_url').$result->retval[0]->token; // Using a template for the html email body $body = $this->ci->parser->parse( 'templates/mailHTML', @@ -490,10 +462,17 @@ class MessageLib { $sender = $result->retval[0]->sender; } + + $receiverContanct = $result->retval[$i]->receiver; + if (!is_null($result->retval[$i]->employeecontact) && $result->retval[$i]->employeecontact != '') + { + $receiverContanct = $result->retval[$i]->employeecontact.'@'.DOMAIN; + } + // Sending email $sent = $this->ci->maillib->send( $sender, - $result->retval[$i]->receiver, + $receiverContanct, $result->retval[$i]->subject, $body, null, @@ -533,10 +512,10 @@ class MessageLib $this->ci->loglib->logError('This person does not have an email account'); // Writing errors in tbl_message_recipient $sme = $this->setMessageError( - $result->retval[$i]->message_id, - $result->retval[$i]->receiver_id, - 'This person does not have an email account', - $result->retval[$i]->sentinfo + $result->retval[$i]->message_id, + $result->retval[$i]->receiver_id, + 'This person does not have an email account', + $result->retval[$i]->sentinfo ); if (!$sme) { @@ -570,11 +549,12 @@ class MessageLib // Get a specific message from DB having EMAIL_KONTAKT_TYPE as relative contact type $result = $this->ci->RecipientModel->getMessages( - EMAIL_KONTAKT_TYPE, - null, - null, - $message_id + EMAIL_KONTAKT_TYPE, + null, + null, + $message_id ); + // Checks if errors were occurred if (isSuccess($result)) { @@ -582,13 +562,14 @@ class MessageLib if (is_array($result->retval) && count($result->retval) > 0) { // If the person has an email account - if (!is_null($result->retval[0]->receiver) && $result->retval[0]->receiver != '') + if ((!is_null($result->retval[0]->receiver) && $result->retval[0]->receiver != '') + || (!is_null($result->retval[0]->employeecontact) && $result->retval[0]->employeecontact != '')) { // If it is required use a multi-part message in MIME format if ($multiPartMime === true) { // Using a template for the html email body - $href = $this->ci->config->item('message_server') . $this->ci->config->item('message_html_view_url') . $result->retval[0]->token; + $href = $this->ci->config->item('message_server').$this->ci->config->item('message_html_view_url').$result->retval[0]->token; $bodyMsg = $this->ci->parser->parse( 'templates/mailHTML', array( @@ -631,10 +612,16 @@ class MessageLib $sender = $result->retval[0]->sender; } + $receiverContanct = $result->retval[0]->receiver; + if (!is_null($result->retval[0]->employeecontact) && $result->retval[0]->employeecontact != '') + { + $receiverContanct = $result->retval[0]->employeecontact.'@'.DOMAIN; + } + // Sending email $sent = $this->ci->maillib->send( $sender, - $result->retval[0]->receiver, + $receiverContanct, is_null($subject) ? $result->retval[0]->subject : $subject, // if parameter subject is not null, use it! $bodyMsg, null, @@ -648,10 +635,10 @@ class MessageLib $this->ci->loglib->logError('Error while sending an email'); // Writing errors in tbl_message_status $sme = $this->setMessageError( - $result->retval[0]->message_id, - $result->retval[0]->receiver_id, - 'Error while sending an email', - $result->retval[0]->sentinfo + $result->retval[0]->message_id, + $result->retval[0]->receiver_id, + 'Error while sending an email', + $result->retval[0]->sentinfo ); if (!$sme) { @@ -674,10 +661,10 @@ class MessageLib $this->ci->loglib->logError('This person does not have an email account'); // Writing errors in tbl_message_status $sme = $this->setMessageError( - $result->retval[0]->message_id, - $result->retval[0]->receiver_id, - 'This person does not have an email account', - $result->retval[0]->sentinfo + $result->retval[0]->message_id, + $result->retval[0]->receiver_id, + 'This person does not have an email account', + $result->retval[0]->sentinfo ); if (!$sme) { @@ -702,8 +689,7 @@ class MessageLib } // ------------------------------------------------------------------------ - // Private Functions from here out! - // ------------------------------------------------------------------------ + // Private methods /** * Update the table tbl_message_recipient @@ -740,7 +726,7 @@ class MessageLib { if (!is_null($prevSentInfo) && $prevSentInfo != '') { - $sentInfo = $prevSentInfo . SENT_INFO_NEWLINE . $sentInfo; + $sentInfo = $prevSentInfo.SENT_INFO_NEWLINE.$sentInfo; } $parameters = array('sent' => null, 'sentinfo' => $sentInfo); @@ -759,8 +745,8 @@ class MessageLib $this->ci->BenutzerfunktionModel->addJoin('public.tbl_benutzer', 'uid'); // Get all the valid receivers id using the oe_kurzbz $receivers = $this->ci->BenutzerfunktionModel->loadWhere( - 'oe_kurzbz = \'' . $oe_kurzbz . '\''. - ' AND funktion_kurzbz = \'' . $this->ci->config->item('assistent_function') . '\'' . + 'oe_kurzbz = \''.$oe_kurzbz.'\''. + ' AND funktion_kurzbz = \''.$this->ci->config->item('assistent_function').'\''. ' AND (NOW() BETWEEN COALESCE(datum_von, NOW()) AND COALESCE(datum_bis, NOW()))' ); diff --git a/application/libraries/MigrationLib.php b/application/libraries/MigrationLib.php index 92899ebca..a35cafc65 100644 --- a/application/libraries/MigrationLib.php +++ b/application/libraries/MigrationLib.php @@ -76,11 +76,11 @@ class MigrationLib extends CI_Migration { if ($this->cli === true) { - $colored = "\033[" . $color . "m%s\033[37m"; + $colored = "\033[".$color."m%s\033[37m"; } else { - $colored = "HTML_COLORS[$color] . "\">%s"; + $colored = "HTML_COLORS[$color]."\">%s"; } } @@ -92,7 +92,7 @@ class MigrationLib extends CI_Migration */ private function _print($prefix, $text, $color = null) { - printf($this->getColored($color), sprintf("%s %s" . $this->getEOL(), $prefix, $text)); + printf($this->getColored($color), sprintf("%s %s".$this->getEOL(), $prefix, $text)); } /** @@ -139,8 +139,8 @@ class MigrationLib extends CI_Migration */ protected function startUP() { - $this->printInfo(sprintf("%s Start method up of class %s %s", - MigrationLib::SEPARATOR, get_called_class(), MigrationLib::SEPARATOR) + $this->printInfo( + sprintf("%s Start method up of class %s %s", MigrationLib::SEPARATOR, get_called_class(), MigrationLib::SEPARATOR) ); } @@ -149,8 +149,8 @@ class MigrationLib extends CI_Migration */ protected function endUP() { - $this->printInfo(sprintf("%s End method up of class %s %s", - MigrationLib::SEPARATOR, get_called_class(), MigrationLib::SEPARATOR) + $this->printInfo( + sprintf("%s End method up of class %s %s", MigrationLib::SEPARATOR, get_called_class(), MigrationLib::SEPARATOR) ); } @@ -159,8 +159,8 @@ class MigrationLib extends CI_Migration */ protected function startDown() { - $this->printInfo(sprintf("%s Start method down of class %s %s", - MigrationLib::SEPARATOR, get_called_class(), MigrationLib::SEPARATOR) + $this->printInfo( + sprintf("%s Start method down of class %s %s", MigrationLib::SEPARATOR, get_called_class(), MigrationLib::SEPARATOR) ); } @@ -169,8 +169,8 @@ class MigrationLib extends CI_Migration */ protected function endDown() { - $this->printInfo(sprintf("%s End method down of class %s %s", - MigrationLib::SEPARATOR, get_called_class(), MigrationLib::SEPARATOR) + $this->printInfo( + sprintf("%s End method down of class %s %s", MigrationLib::SEPARATOR, get_called_class(), MigrationLib::SEPARATOR) ); } @@ -179,11 +179,11 @@ class MigrationLib extends CI_Migration */ protected function addColumn($schema, $table, $fields) { - foreach($fields as $name => $definition) + foreach ($fields as $name => $definition) { if (!$this->columnExists($name, $schema, $table)) { - if ($this->dbforge->add_column($schema . '.' . $table, array($name => $definition))) + if ($this->dbforge->add_column($schema.'.'.$table, array($name => $definition))) { $this->printMessage(sprintf("Column %s.%s.%s of type %s added", $schema, $table, $name, $definition["type"])); } @@ -204,11 +204,11 @@ class MigrationLib extends CI_Migration */ protected function modifyColumn($schema, $table, $fields) { - foreach($fields as $name => $definition) + foreach ($fields as $name => $definition) { if ($this->columnExists($name, $schema, $table)) { - if ($this->dbforge->modify_column($schema . '.' . $table, array($name => $definition))) + if ($this->dbforge->modify_column($schema.'.'.$table, array($name => $definition))) { $this->printMessage(sprintf("Column %s.%s.%s has been modified", $schema, $table, $name)); } @@ -231,7 +231,7 @@ class MigrationLib extends CI_Migration { if ($this->columnExists($field, $schema, $table)) { - if ($this->dbforge->drop_column($schema . '.' . $table, $field)) + if ($this->dbforge->drop_column($schema.'.'.$table, $field)) { $this->printMessage(sprintf("Column %s.%s.%s has been dropped", $schema, $table, $field)); } @@ -289,8 +289,17 @@ class MigrationLib extends CI_Migration */ protected function addForeingKey($schema, $table, $name, $field, $schemaDest, $tableDest, $fieldDest, $attributes) { - $query = sprintf("ALTER TABLE %s.%s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s.%s (%s) %s", - $schema, $table, $name, $field, $schemaDest, $tableDest, $fieldDest, $attributes); + $query = sprintf( + "ALTER TABLE %s.%s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s.%s (%s) %s", + $schema, + $table, + $name, + $field, + $schemaDest, + $tableDest, + $fieldDest, + $attributes + ); if (@$this->db->simple_query($query)) { @@ -371,22 +380,26 @@ class MigrationLib extends CI_Migration if (@$this->db->simple_query($query)) { $this->printMessage( - sprintf("Granted permissions %s on table %s.%s to user %s", - is_null($stringPermission) ? $permissions : $stringPermission, - $schema, - $table, - $user - )); + sprintf( + "Granted permissions %s on table %s.%s to user %s", + is_null($stringPermission) ? $permissions : $stringPermission, + $schema, + $table, + $user + ) + ); } else { $this->printError( - sprintf("Granting permissions %s on table %s.%s to user %s", - is_null($stringPermission) ? $permissions : $stringPermission, - $schema, - $table, - $user - )); + sprintf( + "Granting permissions %s on table %s.%s to user %s", + is_null($stringPermission) ? $permissions : $stringPermission, + $schema, + $table, + $user + ) + ); } } @@ -397,7 +410,7 @@ class MigrationLib extends CI_Migration { $this->dbforge->add_field($fields); - if ($this->dbforge->create_table($schema . '.' . $table, true)) + if ($this->dbforge->create_table($schema.'.'.$table, true)) { $this->printMessage(sprintf("Table %s.%s created or existing", $schema, $table)); } @@ -412,7 +425,7 @@ class MigrationLib extends CI_Migration */ protected function dropTable($schema, $table) { - if ($this->dbforge->drop_table($schema . "." . $table)) + if ($this->dbforge->drop_table($schema.".".$table)) { $this->printMessage(sprintf("Table %s.%s has been dropped", $schema, $table)); } @@ -503,22 +516,26 @@ class MigrationLib extends CI_Migration if (@$this->db->simple_query($query)) { $this->printMessage( - sprintf("Granted permissions %s on sequence %s.%s to user %s", - is_null($stringPermission) ? $permissions : $stringPermission, - $schema, - $sequence, - $user - )); + sprintf( + "Granted permissions %s on sequence %s.%s to user %s", + is_null($stringPermission) ? $permissions : $stringPermission, + $schema, + $sequence, + $user + ) + ); } else { $this->printError( - sprintf("Granting permissions %s on sequence %s.%s to user %s", - is_null($stringPermission) ? $permissions : $stringPermission, - $schema, - $sequence, - $user - )); + sprintf( + "Granting permissions %s on sequence %s.%s to user %s", + is_null($stringPermission) ? $permissions : $stringPermission, + $schema, + $sequence, + $user + ) + ); } } @@ -542,9 +559,9 @@ class MigrationLib extends CI_Migration } $this->printInfo( - "Query correctly executed: " . - substr(preg_replace("/\s+/", " ", trim($query)), 0, MigrationLib::PRINT_QUERY_LEN) . + "Query correctly executed: ". + substr(preg_replace("/\s+/", " ", trim($query)), 0, MigrationLib::PRINT_QUERY_LEN). (strlen($query) > MigrationLib::PRINT_QUERY_LEN ? "..." : "") ); } -} \ No newline at end of file +} diff --git a/application/libraries/OrganisationseinheitLib.php b/application/libraries/OrganisationseinheitLib.php index 8d125abc0..e70e8cb76 100644 --- a/application/libraries/OrganisationseinheitLib.php +++ b/application/libraries/OrganisationseinheitLib.php @@ -4,6 +4,9 @@ if (! defined("BASEPATH")) exit("No direct script access allowed"); class OrganisationseinheitLib { + /** + * Loads model OrganisationseinheitModel + */ public function __construct() { $this->ci =& get_instance(); @@ -22,7 +25,7 @@ class OrganisationseinheitLib * to the top, starting from the given oe_kurzbz. It stops when it finds a * match with the other table, which attributes are passed as parameters: * schema name, table name, fields to be selected, where conditions, orderby clause - * + * * @param string $schema REQUIRED * @param string $table REQUIRED * @param mixed $fields REQUIRED @@ -63,6 +66,9 @@ class OrganisationseinheitLib return $result; } + /** + * treeSearchEntire + */ public function treeSearchEntire($table, $alias, $fields, $where, $orderby, $oe_kurzbz) { $select = ""; @@ -90,12 +96,15 @@ class OrganisationseinheitLib { $tmpResult = $this->treeSearchEntire($table, $alias, $select, $where, $orderby, $result->retval[0]->_ppk); - if (hasData($tmpResult) && $tmpResult->retval[0]->_pk != null && $tmpResult->retval[0]->_ppk != null && $tmpResult->retval[0]->_jtpk != null) + if (hasData($tmpResult) + && $tmpResult->retval[0]->_pk != null + && $tmpResult->retval[0]->_ppk != null + && $tmpResult->retval[0]->_jtpk != null) { $result->retval = array_merge($result->retval, $tmpResult->retval); } } - else if ($result->retval[0]->_ppk != null) + elseif ($result->retval[0]->_ppk != null) { $result = $this->treeSearchEntire($table, $alias, $select, $where, $orderby, $result->retval[0]->_ppk); } @@ -103,4 +112,4 @@ class OrganisationseinheitLib return $result; } -} \ No newline at end of file +} diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php index 3bd70eb40..f418f06b2 100644 --- a/application/libraries/PermissionLib.php +++ b/application/libraries/PermissionLib.php @@ -37,7 +37,7 @@ class PermissionLib * PermissionLib's constructor * Here is initialized the static property bb with all the rights of the user (API caller) */ - function __construct() + public function __construct() { // Loads CI instance $this->ci =& get_instance(); @@ -64,17 +64,16 @@ class PermissionLib */ public function isEntitled($sourceName, $permissionType) { + $isEntitled = false; + // If the resource exists if (isset($this->acl[$sourceName])) { // Checks permission - return $this->_isBerechtigt($this->acl[$sourceName], $permissionType); - } - // if the resource does not exist, do not lose useful clock cycles - else - { - return false; + $isEntitled = $this->_isBerechtigt($this->acl[$sourceName], $permissionType); } + + return $isEntitled; } /** @@ -82,26 +81,26 @@ class PermissionLib */ public function getBerechtigungKurzbz($sourceName) { + $returnValue = null; + if (isset($this->acl[$sourceName])) { - return $this->acl[$sourceName]; - } - else - { - return null; + $returnValue = $this->acl[$sourceName]; } + + return $returnValue; } /** * Checks user's (API caller) rights */ - private function _isBerechtigt($berechtigung_kurzbz, $art = null, $oe_kurzbz = null, $kostenstelle_id = null) + private function _isBerechtigt($berechtigung_kurzbz, $art = null, $oe_kurzbz = null, $kostenstelle_id = null) { $isBerechtigt = false; if (!is_null($berechtigung_kurzbz)) { - if(self::$bb->isBerechtigt($berechtigung_kurzbz, $oe_kurzbz, $art, $kostenstelle_id)) + if (self::$bb->isBerechtigt($berechtigung_kurzbz, $oe_kurzbz, $art, $kostenstelle_id)) { $isBerechtigt = true; } @@ -109,4 +108,4 @@ class PermissionLib return $isBerechtigt; } -} \ No newline at end of file +} diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php index 0ae5c72c0..873da85c1 100644 --- a/application/libraries/PhrasesLib.php +++ b/application/libraries/PhrasesLib.php @@ -1,15 +1,11 @@ ci->load->helper('language'); // Loads helper message to manage returning messages $this->ci->load->helper('message'); - - //$this->ci->lang->load('fhcomplete'); } /** * getPhrase() - will load a spezific Phrase - * - * @param integer $vorlage_kurzbz REQUIRED - * @return struct */ - function getPhrase($phrase_id) + public function getPhrase($phrase_id) { if (empty($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID); @@ -49,17 +40,17 @@ class PhrasesLib /** * getSubMessages() - will return all Messages subordinated from a specified message. - * - * @param integer $msg_id REQUIRED - * @return array */ - function getPhraseByApp($app = null) + public function getPhraseByApp($app = null) { $phrases = $this->ci->PhraseModel->loadWhere(array('app' => $app)); return $phrases; } - function getPhraseInhalt($phrase_id) + /** + * getPhraseInhalt + */ + public function getPhraseInhalt($phrase_id) { if (empty($phrase_id)) return error(MSG_ERR_INVALID_MSG_ID); @@ -68,7 +59,10 @@ class PhrasesLib return $phrasentext; } - function delPhrasentext($phrasentext_id) + /** + * delPhrasentext + */ + public function delPhrasentext($phrasentext_id) { if (empty($phrasentext_id)) return error(MSG_ERR_INVALID_MSG_ID); @@ -79,11 +73,8 @@ class PhrasesLib /** * savePhrase() - will save a spezific Phrase. - * - * @param array $data REQUIRED - * @return array */ - function savePhrase($phrase_id, $data) + public function savePhrase($phrase_id, $data) { if (empty($data)) return error(MSG_ERR_INVALID_MSG_ID); @@ -95,11 +86,8 @@ class PhrasesLib /** * getVorlagetextByVorlage() - will load tbl_vorlagestudiengang for a spezific Template. - * - * @param string $vorlage_kurzbz REQUIRED - * @return array */ - function getPhrasentextById($phrasentext_id) + public function getPhrasentextById($phrasentext_id) { if (empty($phrasentext_id)) return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false)); @@ -109,11 +97,9 @@ class PhrasesLib } /** - * getPhrases() - - * - * @return struct + * getPhrases() */ - function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null, $blockTags = null) + public function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null, $blockTags = null) { if (isset($app) && isset($sprache)) { @@ -163,11 +149,8 @@ class PhrasesLib /** * insertPhraseinhalt() - will load tbl_vorlagestudiengang for a spezific Template. - * - * @param string $vorlage_kurzbz REQUIRED - * @return array */ - function insertPhraseinhalt($data) + public function insertPhraseinhalt($data) { $phrasentext = $this->ci->PhrasentextModel->insert($data); return $phrasentext; @@ -175,11 +158,8 @@ class PhrasesLib /** * getVorlagetextById() - will load tbl_vorlagestudiengang for a spezific Template. - * - * @param string $vorlage_kurzbz REQUIRED - * @return array */ - function getVorlagetextById($vorlagestudiengang_id) + public function getVorlagetextById($vorlagestudiengang_id) { $vorlagetext = $this->ci->VorlageStudiengangModel->load($vorlagestudiengang_id); return $vorlagetext; @@ -187,11 +167,8 @@ class PhrasesLib /** * saveVorlagetext() - will load tbl_vorlagestudiengang for a spezific Template. - * - * @param string $vorlage_kurzbz REQUIRED - * @return array */ - function updatePhraseInhalt($phrasentext_id, $data) + public function updatePhraseInhalt($phrasentext_id, $data) { $phrasentext = $this->ci->PhrasentextModel->update($phrasentext_id, $data); return $phrasentext; @@ -199,16 +176,12 @@ class PhrasesLib /** * parseVorlagetext() - will parse a Vorlagetext. - * - * @param string $text REQUIRED - * @param array $data REQUIRED - * @return string */ - function parseVorlagetext($text, $data = array()) + public function parseVorlagetext($text, $data = array()) { if (empty($text)) return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false)); - $text = $this->ci->parser->parse_string($text, $data, TRUE); + $text = $this->ci->parser->parse_string($text, $data, true); return $text; } -} \ No newline at end of file +} diff --git a/application/libraries/ReihungstestLib.php b/application/libraries/ReihungstestLib.php index 4030e50c3..5b40e65e3 100644 --- a/application/libraries/ReihungstestLib.php +++ b/application/libraries/ReihungstestLib.php @@ -2,9 +2,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); -/** - * - */ class ReihungstestLib { /** @@ -84,4 +81,4 @@ class ReihungstestLib return false; } -} \ No newline at end of file +} diff --git a/application/libraries/UDFLib.php b/application/libraries/UDFLib.php index f174dd8e5..ad0e14c03 100644 --- a/application/libraries/UDFLib.php +++ b/application/libraries/UDFLib.php @@ -12,7 +12,7 @@ class UDFLib const TABLE_ARG_NAME = 'table'; const FIELD_ARG_NAME = 'field'; const UDFS_ARG_NAME = 'udfs'; - + // UDF json schema attributes const NAME = 'name'; // UDF name attribute const TYPE = 'type'; // UDF type attribute @@ -21,12 +21,12 @@ class UDFLib const LIST_VALUES = 'listValues'; // UDF listValues attribute const FE_REGEX_LANGUAGE = 'js'; // UDF javascript regex language attribute (front end) const BE_REGEX_LANGUAGE = 'php'; // UDF php regex language attribute (back end) - + // HTML components const LABEL = 'title'; const TITLE = 'description'; const PLACEHOLDER = 'placeholder'; - + // Validation attributes const REGEX = 'regex'; const REQUIRED = 'required'; @@ -34,34 +34,34 @@ class UDFLib const MIN_VALUE = 'min-value'; const MAX_LENGTH = 'max-length'; const MIN_LENGTH = 'min-length'; - + // UDF DB constants const COLUMN_TYPE = 'jsonb'; const COLUMN_NAME = 'udf_values'; const COLUMN_PREFIX = 'udf_'; const COLUMN_JSON_DESCRIPTION = 'jsons'; - + const CHKBOX_TYPE = 'checkbox'; // UDF checkbox type - + const PHRASES_APP_NAME = 'core'; // Name of the app parameter used to retrive phrases - + private $_ci; // Code igniter instance - + /** - * + * Loads fhc helper */ public function __construct() { $this->_ci =& get_instance(); - + $this->_ci->load->helper('fhc'); } - + // ------------------------------------------------------------------------------------------------- // Public methods - + /** - * + * UDFWidget */ public function UDFWidget($args, $htmlArgs = array()) { @@ -69,16 +69,16 @@ class UDFLib { // Loads the widget library $this->_ci->load->library('WidgetLib'); - + // Loads widgets to render HTML for UDF loadResource(APPPATH.'widgets/udf'); - + // Default external block is true if (empty($args[UDFLib::FIELD_ARG_NAME]) && !isset($htmlArgs[HTMLWidget::EXTERNAL_BLOCK])) { $htmlArgs[HTMLWidget::EXTERNAL_BLOCK] = true; } - + return $this->_ci->widgetlib->widget( UDFLib::WIDGET_NAME, $args, @@ -97,9 +97,10 @@ class UDFLib } } } - + /** * It renders the HTML of the UDF + * * NOTE: When this method is called $widgetData contains different data from * parameter $args in the constructor */ @@ -107,12 +108,12 @@ class UDFLib { $schema = $widgetData[UDFLib::SCHEMA_ARG_NAME]; // schema attribute $table = $widgetData[UDFLib::TABLE_ARG_NAME]; // table attribute - + if (isset($widgetData[UDFLib::FIELD_ARG_NAME])) { $field = $widgetData[UDFLib::FIELD_ARG_NAME]; // UDF name } - + $udfResults = $this->_loadUDF($schema, $table); // loads UDF definition if (hasData($udfResults)) { @@ -131,13 +132,13 @@ class UDFLib { $jsonSchemasArray = $jsonSchemas; } - + $found = false; // used to check if the field is found or not in the json schema - + $this->_sortJsonSchemas($jsonSchemasArray); // Sort the list of UDF by sort property - + // Loops through json schemas - foreach($jsonSchemasArray as $jsonSchema) + foreach ($jsonSchemasArray as $jsonSchema) { // If the type property is not present then show an error if (!isset($jsonSchema->{UDFLib::TYPE})) @@ -149,22 +150,22 @@ class UDFLib { show_error(sprintf('%s.%s: Attribute "name" not present in the json schema', $schema, $table)); } - + // If a UDF is specified and is present in the json schemas list or no UDF is specified if ((isset($field) && $field == $jsonSchema->{UDFLib::NAME}) || !isset($field)) { // Set attributes using phrases $this->_setAttributesWithPhrases($jsonSchema, $widgetData[HTMLWidget::HTML_ARG_NAME]); - + // Set validation attributes $this->_setValidationAttributes($jsonSchema, $widgetData[HTMLWidget::HTML_ARG_NAME]); - + // Set name and id attributes $this->_setNameAndId($jsonSchema, $widgetData[HTMLWidget::HTML_ARG_NAME]); - + // Render the HTML for this UDF $this->_render($jsonSchema, $widgetData); - + // If a UDf is specified and it was found then stop looking through this list if (isset($field) && $field == $jsonSchema->{UDFLib::NAME}) { @@ -173,7 +174,7 @@ class UDFLib } } } - + // If a UDf is specified and it was not found then show an error if (isset($field) && !$found) { @@ -191,7 +192,7 @@ class UDFLib } } } - + /** * Manage UDFs */ @@ -200,9 +201,9 @@ class UDFLib $validate = success(true); // returned value // Contains a list of validation errors for the UDFs that have not passed the validation $notValidUDFsArray = array(); - + $this->_ci->load->model('system/UDF_model', 'UDFModel'); - + // Retrieves UDFs definitions for this table $resultUDFsDefinitions = $this->_ci->UDFModel->getUDFsDefinitions($schemaAndTable); if (hasData($resultUDFsDefinitions)) // standard check if everything is ok and data are present @@ -210,27 +211,27 @@ class UDFLib // Get udf values from $data & clean udf values from $data // NOTE: Must be performed here because the load method populates the property UDFs too $this->_popUDFParameters($data); - + $requiredUDFsArray = array(); // contains a list of required UDFs // Contains the UDFs values to be stored // NOTE: the UDFs supplied that are not present in the UDF definition of this table, will be discarded $toBeStoredUDFsArray = array(); - + // Decodes json that define the UDFs for this table $decodedUDFDefinitions = json_decode( $resultUDFsDefinitions->retval[0]->{UDFLib::COLUMN_JSON_DESCRIPTION} ); - + // Loops through the UDFs definitions for ($i = 0; $i < count($decodedUDFDefinitions); $i++) { $decodedUDFDefinition = $decodedUDFDefinitions[$i]; // Definition of a single UDF - + // Loops through the UDFs values that should be stored foreach ($this->UDFs as $key => $val) { $tmpValidate = success(true); // temporary variable used to store the returned value from _validateUDFs - + // If this is the definition of this UDF if ($decodedUDFDefinition->{UDFLib::NAME} == $key) { @@ -258,7 +259,7 @@ class UDFLib ); } } - + // If the previous required check has failed then the validation is not performed if ($chkRequiredPassed === true) { @@ -266,7 +267,7 @@ class UDFLib // If $toBeValidated == true => validation is performed // If $toBeValidated == false => validation is NOT performed $toBeValidated = false; - // If this UDF is NOT a checkbox + // If this UDF is NOT a checkbox if ($decodedUDFDefinition->{UDFLib::TYPE} != UDFLib::CHKBOX_TYPE) { // If required property is NOT present in the UDF description @@ -288,18 +289,18 @@ class UDFLib $toBeValidated = true; } } - + if ($toBeValidated === true) // Checks if validation should be performed { $tmpValidate = $this->_validateUDFs( - $decodedUDFDefinition->{UDFLib::VALIDATION}, // - $decodedUDFDefinition->{UDFLib::NAME}, // - $val // + $decodedUDFDefinition->{UDFLib::VALIDATION}, + $decodedUDFDefinition->{UDFLib::NAME}, + $val ); } } } - + // If validation is ok copy the value that is to be stored into $toBeStoredUDFsArray if (isSuccess($tmpValidate)) { @@ -312,14 +313,14 @@ class UDFLib } } } - + // Copies the remaining required UDFs into $notValidUDFsArray // because they were not supplied, therefore must be notified as error - foreach($requiredUDFsArray as $key => $val) + foreach ($requiredUDFsArray as $key => $val) { $notValidUDFsArray[] = array($val); } - + // If the validation of all the supplied UDFs is ok if (count($notValidUDFsArray) == 0) { @@ -327,7 +328,7 @@ class UDFLib // of the UDF that are not updated if (is_array($udfValues) && count($udfValues) > 0) { - foreach($udfValues as $fieldName => $fieldValue) + foreach ($udfValues as $fieldName => $fieldValue) { // If this field is not present in the given parameters // then copy it from the DB without changes @@ -349,35 +350,35 @@ class UDFLib $validate = error($notValidUDFsArray, EXIT_VALIDATION_UDF); } } - + return $validate; } - + /** - * + * isUDFColumn */ public function isUDFColumn($columnName, $columnType) { $isUDFColumn = false; - + if (substr($columnName, 0, strlen(UDFLib::COLUMN_PREFIX)) == UDFLib::COLUMN_PREFIX && $columnType == UDFLib::COLUMN_TYPE) { $isUDFColumn = true; } - + return $isUDFColumn; } - + // ------------------------------------------------------------------------------------------------- // Private methods - + /** * Move UDFs from $data to $UDFs */ private function _popUDFParameters(&$data) { - foreach($data as $key => $val) + foreach ($data as $key => $val) { if (substr($key, 0, 4) == UDFLib::COLUMN_PREFIX) { @@ -386,23 +387,23 @@ class UDFLib } } } - + /** * Validates UDF value */ private function _validateUDFs($decodedUDFValidation, $udfName, $udfValue) { $returnArrayValidation = array(); // returned value - + // If $udfValue is not an array, then store it inside a new array $tmpUdfValues = $udfValue; if (!is_array($udfValue)) { $tmpUdfValues = array($udfValue); } - + // Loops through all the supplied UDFs values - foreach($tmpUdfValues as $udfValIndx => $udfVal) + foreach ($tmpUdfValues as $udfValIndx => $udfVal) { // If the single UDF value is not an array or an object if (!is_array($udfVal) && !is_object($udfVal)) @@ -418,7 +419,7 @@ class UDFLib // validation is failed and the error is stored in $returnArrayValidation $returnArrayValidation[] = error($udfName, EXIT_VALIDATION_UDF_MIN_VALUE); } - + // If max value attribute is present in the validation for this UDF, // then checks if the value of this UDF is compliant to this attribute if (isset($decodedUDFValidation->{UDFLib::MAX_VALUE}) @@ -428,7 +429,7 @@ class UDFLib $returnArrayValidation[] = error($udfName, EXIT_VALIDATION_UDF_MAX_VALUE); } } - + $strUdfVal = strval($udfVal); // store in $strUdfVal the string conversion of $udfVal // If min length attribute is present in the validation for this UDF, // then checks if the value of this UDF is compliant to this attribute @@ -438,7 +439,7 @@ class UDFLib // validation is failed and the error is stored in $returnArrayValidation $returnArrayValidation[] = error($udfName, EXIT_VALIDATION_UDF_MIN_LENGTH); } - + // If max length attribute is present in the validation for this UDF, // then checks if the value of this UDF is compliant to this attribute if (isset($decodedUDFValidation->{UDFLib::MAX_LENGTH}) && isset($strUdfVal) @@ -447,7 +448,7 @@ class UDFLib // validation is failed and the error is stored in $returnArrayValidation $returnArrayValidation[] = error($udfName, EXIT_VALIDATION_UDF_MAX_LENGTH); } - + // If $udfVal is a string if (is_string($udfVal)) { @@ -456,7 +457,7 @@ class UDFLib if (isset($decodedUDFValidation->{UDFLib::REGEX}) && is_array($decodedUDFValidation->{UDFLib::REGEX})) { - foreach($decodedUDFValidation->{UDFLib::REGEX} as $regexIndx => $regex) + foreach ($decodedUDFValidation->{UDFLib::REGEX} as $regexIndx => $regex) { if ($regex->language == UDFLib::BE_REGEX_LANGUAGE) { @@ -475,16 +476,16 @@ class UDFLib $returnArrayValidation[] = error($udfName, EXIT_VALIDATION_UDF_NOT_VALID_VAL); } } - + // If no UDF validation errors were raised, it's a success!! if (count($returnArrayValidation) == 0) { $returnArrayValidation = success(true); } - + return $returnArrayValidation; } - + /** * Set the name and id attribute of the HTML element */ @@ -493,15 +494,13 @@ class UDFLib $htmlParameters[HTMLWidget::HTML_ID] = $jsonSchema->{UDFLib::NAME}; $htmlParameters[HTMLWidget::HTML_NAME] = $jsonSchema->{UDFLib::NAME}; } - + /** * Sort the list of UDF by sort property */ private function _sortJsonSchemas(&$jsonSchemasArray) { - // usort($jsonSchemasArray, function ($a, $b) { - // if (!isset($a->{UDFLib::SORT})) { $a->{UDFLib::SORT} = 9999; @@ -510,16 +509,15 @@ class UDFLib { $b->{UDFLib::SORT} = 9999; } - if ($a->{UDFLib::SORT} == $b->{UDFLib::SORT}) { return 0; } - + return ($a->{UDFLib::SORT} < $b->{UDFLib::SORT}) ? -1 : 1; }); } - + /** * Loads the UDF description by the given schema and table */ @@ -527,21 +525,21 @@ class UDFLib { // Loads UDF model $this->_ci->load->model('system/UDF_model', 'UDFModel'); - + $udfResults = $this->_ci->UDFModel->loadWhere( array( 'schema' => $schema, 'table' => $table ) ); - + if (isError($udfResults)) { if (is_object($udfResults) && isset($udfResults->retval)) { show_error($udfResults->retval); } - else if (is_string($udfResults)) + elseif (is_string($udfResults)) { show_error($udfResults); } @@ -550,14 +548,14 @@ class UDFLib show_error('UDFWidget: generic error occurred'); } } - else if (!hasData($udfResults)) + elseif (!hasData($udfResults)) { show_error(sprintf('%s.%s does not contain UDF', $schema, $table)); } - + return $udfResults; } - + /** * Render the HTML for the UDF */ @@ -569,32 +567,32 @@ class UDFLib $this->_renderCheckbox($jsonSchema, $widgetData); } // Textfield - else if ($jsonSchema->{UDFLib::TYPE} == 'textfield') + elseif ($jsonSchema->{UDFLib::TYPE} == 'textfield') { $this->_renderTextfield($jsonSchema, $widgetData); } // Textarea - else if ($jsonSchema->{UDFLib::TYPE} == 'textarea') + elseif ($jsonSchema->{UDFLib::TYPE} == 'textarea') { $this->_renderTextarea($jsonSchema, $widgetData); } // Date - else if ($jsonSchema->{UDFLib::TYPE} == 'date') + elseif ($jsonSchema->{UDFLib::TYPE} == 'date') { - + // To be done } // Dropdown - else if ($jsonSchema->{UDFLib::TYPE} == 'dropdown') + elseif ($jsonSchema->{UDFLib::TYPE} == 'dropdown') { $this->_renderDropdown($jsonSchema, $widgetData); } // Multiple dropdown - else if ($jsonSchema->{UDFLib::TYPE} == 'multipledropdown') + elseif ($jsonSchema->{UDFLib::TYPE} == 'multipledropdown') { $this->_renderDropdown($jsonSchema, $widgetData, true); } } - + /** * Renders a dropdown element */ @@ -610,34 +608,34 @@ class UDFLib { $widgetData[DropdownWidget::SELECTED_ELEMENT] = null; } - + $dropdownWidgetUDF = new DropdownWidgetUDF(UDFLib::WIDGET_NAME, $widgetData); $parameters = array(); - + // If the list of values to show is an array if (isset($jsonSchema->{UDFLib::LIST_VALUES}->enum)) { $parameters = $jsonSchema->{UDFLib::LIST_VALUES}->enum; } // If the list of values to show should be retrived with a SQL statement - else if (isset($jsonSchema->{UDFLib::LIST_VALUES}->sql)) + elseif (isset($jsonSchema->{UDFLib::LIST_VALUES}->sql)) { // UDFModel is loaded in method _loadUDF that is called before the current method $queryResult = $this->_ci->UDFModel->execQuery($jsonSchema->{UDFLib::LIST_VALUES}->sql); if (hasData($queryResult)) - { + { $parameters = $queryResult->retval; } } - + if ($multiple) // multiple dropdown { $dropdownWidgetUDF->setMultiple(); } - + $dropdownWidgetUDF->render($parameters); } - + /** * Renders a textarea element */ @@ -645,17 +643,17 @@ class UDFLib { $text = null; // text value $textareaUDF = new TextareaWidgetUDF(UDFLib::WIDGET_NAME, $widgetData); - + // Set text value if present in the DB if (isset($widgetData[UDFLib::UDFS_ARG_NAME]) && isset($widgetData[UDFLib::UDFS_ARG_NAME][$jsonSchema->{UDFLib::NAME}])) { $text = $widgetData[UDFLib::UDFS_ARG_NAME][$jsonSchema->{UDFLib::NAME}]; } - + $textareaUDF->render($text); } - + /** * Renders an input text element */ @@ -663,17 +661,17 @@ class UDFLib { $text = null; // text value $textareaUDF = new TextfieldWidgetUDF(UDFLib::WIDGET_NAME, $widgetData); - + // Set text value if present in the DB if (isset($widgetData[UDFLib::UDFS_ARG_NAME]) && isset($widgetData[UDFLib::UDFS_ARG_NAME][$jsonSchema->{UDFLib::NAME}])) { $text = $widgetData[UDFLib::UDFS_ARG_NAME][$jsonSchema->{UDFLib::NAME}]; } - + $textareaUDF->render($text); } - + /** * Renders a checkbox element */ @@ -689,17 +687,22 @@ class UDFLib { $widgetData[CheckboxWidget::VALUE_FIELD] = CheckboxWidget::HTML_DEFAULT_VALUE; } - + $checkboxWidgetUDF = new CheckboxWidgetUDF(UDFLib::WIDGET_NAME, $widgetData); - + $checkboxWidgetUDF->render(); } - + /** * Sets the attributes of the HTML element using the phrases system */ private function _setAttributesWithPhrases($jsonSchema, &$htmlParameters) { + // By default set to null all the attributes + $htmlParameters[HTMLWidget::LABEL] = null; + $htmlParameters[HTMLWidget::TITLE] = null; + $htmlParameters[HTMLWidget::PLACEHOLDER] = null; + // Description, title and placeholder if (isset($jsonSchema->{UDFLib::LABEL}) || isset($jsonSchema->{UDFLib::TITLE}) @@ -707,14 +710,14 @@ class UDFLib { // Loads PhrasesLib $this->_ci->load->library('PhrasesLib'); - + // If is set the label property in the json schema if (isset($jsonSchema->{UDFLib::LABEL})) { // Load the related phrase $tmpResult = $this->_ci->phraseslib->getPhrases( UDFLib::PHRASES_APP_NAME, - DEFAULT_LEHREINHEIT_SPRACHE, + DEFAULT_LANGUAGE, $jsonSchema->{UDFLib::LABEL}, null, null, @@ -724,19 +727,15 @@ class UDFLib { $htmlParameters[HTMLWidget::LABEL] = $tmpResult->retval[0]->text; } - else - { - $htmlParameters[HTMLWidget::LABEL] = null; - } } - + // If is set the title property in the json schema if (isset($jsonSchema->{UDFLib::TITLE})) { // Load the related phrase $tmpResult = $this->_ci->phraseslib->getPhrases( UDFLib::PHRASES_APP_NAME, - DEFAULT_LEHREINHEIT_SPRACHE, + DEFAULT_LANGUAGE, $jsonSchema->{UDFLib::TITLE}, null, null, @@ -746,19 +745,15 @@ class UDFLib { $htmlParameters[HTMLWidget::TITLE] = $tmpResult->retval[0]->text; } - else - { - $htmlParameters[HTMLWidget::TITLE] = null; - } } - + // If is set the placeholder property in the json schema if (isset($jsonSchema->{UDFLib::PLACEHOLDER})) { // Load the related phrase $tmpResult = $this->_ci->phraseslib->getPhrases( UDFLib::PHRASES_APP_NAME, - DEFAULT_LEHREINHEIT_SPRACHE, + DEFAULT_LANGUAGE, $jsonSchema->{UDFLib::PLACEHOLDER}, null, null, @@ -768,14 +763,10 @@ class UDFLib { $htmlParameters[HTMLWidget::PLACEHOLDER] = $tmpResult->retval[0]->text; } - else - { - $htmlParameters[HTMLWidget::PLACEHOLDER] = null; - } } } } - + /** * Sets the validation attributes of the HTML element using the configuration inside the json schema */ @@ -786,17 +777,19 @@ class UDFLib $htmlParameters[HTMLWidget::REQUIRED] = null; $htmlParameters[HTMLWidget::MIN_VALUE] = null; $htmlParameters[HTMLWidget::MAX_VALUE] = null; - + $htmlParameters[HTMLWidget::MIN_LENGTH] = null; + $htmlParameters[HTMLWidget::MAX_LENGTH] = null; + // If validation property is present in the json schema if (isset($jsonSchema->{UDFLib::VALIDATION})) { $jsonSchemaValidation =& $jsonSchema->{UDFLib::VALIDATION}; // Reference for a better code readability - - // Front end regex + + // Front-end regex if (isset($jsonSchemaValidation->{UDFLib::REGEX}) && is_array($jsonSchemaValidation->{UDFLib::REGEX})) { - foreach($jsonSchemaValidation->{UDFLib::REGEX} as $regex) + foreach ($jsonSchemaValidation->{UDFLib::REGEX} as $regex) { if ($regex->language === UDFLib::FE_REGEX_LANGUAGE) { @@ -804,31 +797,31 @@ class UDFLib } } } - + // Required if (isset($jsonSchemaValidation->{UDFLib::REQUIRED})) { $htmlParameters[HTMLWidget::REQUIRED] = $jsonSchemaValidation->{UDFLib::REQUIRED}; } - + // Min value if (isset($jsonSchemaValidation->{UDFLib::MIN_VALUE})) { $htmlParameters[HTMLWidget::MIN_VALUE] = $jsonSchemaValidation->{UDFLib::MIN_VALUE}; } - + // Max value if (isset($jsonSchemaValidation->{UDFLib::MAX_VALUE})) { $htmlParameters[HTMLWidget::MAX_VALUE] = $jsonSchemaValidation->{UDFLib::MAX_VALUE}; } - + // Min length if (isset($jsonSchemaValidation->{UDFLib::MIN_LENGTH})) { $htmlParameters[HTMLWidget::MIN_LENGTH] = $jsonSchemaValidation->{UDFLib::MIN_LENGTH}; } - + // Max length if (isset($jsonSchemaValidation->{UDFLib::MAX_LENGTH})) { @@ -836,4 +829,4 @@ class UDFLib } } } -} \ No newline at end of file +} diff --git a/application/libraries/VorlageLib.php b/application/libraries/VorlageLib.php index eb0caa3a8..81ce44149 100644 --- a/application/libraries/VorlageLib.php +++ b/application/libraries/VorlageLib.php @@ -1,16 +1,14 @@ ci->VorlageModel->loadWhere(array('mimetype' => $mimetype)); return $vorlage; } - /** * saveVorlage() - will save a spezific Template. * * @param array $data REQUIRED * @return array */ - function saveVorlage($vorlage_kurzbz, $data) + public function saveVorlage($vorlage_kurzbz, $data) { if (empty($data)) return error(MSG_ERR_INVALID_MSG_ID); @@ -72,19 +69,18 @@ class VorlageLib return $vorlage; } - /** * getVorlagetextByVorlage() - will load tbl_vorlagestudiengang for a spezific Template. * * @param string $vorlage_kurzbz REQUIRED * @return array */ - function getVorlagetextByVorlage($vorlage_kurzbz) + public function getVorlagetextByVorlage($vorlage_kurzbz) { if (empty($vorlage_kurzbz)) return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false)); - $vorlage = $this->ci->VorlageStudiengangModel->loadWhere(array('vorlage_kurzbz' =>$vorlage_kurzbz)); + $vorlage = $this->ci->VorlageStudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz)); return $vorlage; } @@ -97,7 +93,7 @@ class VorlageLib * @param string $sprache OPTIONAL * @return array */ - function loadVorlagetext($vorlage_kurzbz, $oe_kurzbz = null, $orgform_kurzbz = null, $sprache = null) + public function loadVorlagetext($vorlage_kurzbz, $oe_kurzbz = null, $orgform_kurzbz = null, $sprache = null) { if (empty($vorlage_kurzbz)) return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false)); @@ -126,40 +122,35 @@ class VorlageLib $where = $this->_where($vorlage_kurzbz, $orgform_kurzbz, $sprache); $vorlage = $this->ci->organisationseinheitlib->treeSearch( - 'public', - 'tbl_vorlagestudiengang', - array("vorlage_kurzbz", "studiengang_kz", "version", "text", "oe_kurzbz", - "vorlagestudiengang_id", "style", "berechtigung", "anmerkung_vorlagestudiengang", - "aktiv", "sprache", "subject", "orgform_kurzbz"), - $where, - "version DESC", - $oe_kurzbz + 'public', + 'tbl_vorlagestudiengang', + array("vorlage_kurzbz", "studiengang_kz", "version", "text", "oe_kurzbz", + "vorlagestudiengang_id", "style", "berechtigung", "anmerkung_vorlagestudiengang", + "aktiv", "sprache", "subject", "orgform_kurzbz"), + $where, + "version DESC", + $oe_kurzbz ); } return $vorlage; } - + + /** + * _where + */ private function _where($vorlage_kurzbz, $orgform_kurzbz, $sprache) { // Builds where clause $where = "vorlage_kurzbz = ".$this->ci->VorlageModel->escape($vorlage_kurzbz); -// if (is_null($orgform_kurzbz)) -// { -// $where .= " AND orgform_kurzbz IS NULL"; -// } -// else -// { -// $where .= " AND orgform_kurzbz = " . $this->ci->VorlageModel->escape($orgform_kurzbz); -// } - + if (is_null($sprache)) { $where .= " AND sprache IS NULL"; } else { - $where .= " AND sprache = " . $this->ci->VorlageModel->escape($sprache); + $where .= " AND sprache = ".$this->ci->VorlageModel->escape($sprache); } $where .= " AND aktiv = true"; @@ -173,7 +164,7 @@ class VorlageLib * @param string $vorlage_kurzbz REQUIRED * @return array */ - function insertVorlagetext($data) + public function insertVorlagetext($data) { $vorlagetext = $this->ci->VorlageStudiengangModel->insert($data); return $vorlagetext; @@ -185,7 +176,7 @@ class VorlageLib * @param string $vorlage_kurzbz REQUIRED * @return array */ - function getVorlagetextById($vorlagestudiengang_id) + public function getVorlagetextById($vorlagestudiengang_id) { $vorlagetext = $this->ci->VorlageStudiengangModel->load($vorlagestudiengang_id); return $vorlagetext; @@ -197,7 +188,7 @@ class VorlageLib * @param string $vorlage_kurzbz REQUIRED * @return array */ - function updateVorlagetext($vorlagestudiengang_id, $data) + public function updateVorlagetext($vorlagestudiengang_id, $data) { $vorlagetext = $this->ci->VorlageStudiengangModel->update($vorlagestudiengang_id, $data); return $vorlagetext; @@ -210,11 +201,11 @@ class VorlageLib * @param array $data REQUIRED * @return string */ - function parseVorlagetext($text, $data = array()) + public function parseVorlagetext($text, $data = array()) { if (empty($text)) return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false)); - $text = $this->ci->parser->parse_string($text, $data, TRUE); + $text = $this->ci->parser->parse_string($text, $data, true); return $text; } -} \ No newline at end of file +} diff --git a/application/models/codex/Orgform_model.php b/application/models/codex/Orgform_model.php index 238376ba4..69a9d6b0d 100644 --- a/application/models/codex/Orgform_model.php +++ b/application/models/codex/Orgform_model.php @@ -12,11 +12,13 @@ class Orgform_model extends DB_Model $this->pk = 'orgform_kurzbz'; } + /** + * Returns all the orgform except VBB and ZGS + */ public function getOrgformLV() { // Checks rights - if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $query = "SELECT * FROM bis.tbl_orgform @@ -25,4 +27,4 @@ class Orgform_model extends DB_Model return $this->execQuery($query); } -} \ No newline at end of file +} diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php index 8fb1a0ba3..4301af240 100644 --- a/application/models/crm/Akte_model.php +++ b/application/models/crm/Akte_model.php @@ -13,19 +13,12 @@ class Akte_model extends DB_Model } /** - * + * getAkten */ public function getAkten($person_id, $dokument_kurzbz = null, $stg_kz = null, $prestudent_id = null) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_dokument', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_dokumentstudiengang', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $query = 'SELECT akte_id, person_id, @@ -79,17 +72,12 @@ class Akte_model extends DB_Model } /** - * + * getAktenAccepted */ public function getAktenAccepted($person_id, $dokument_kurzbz = null) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $query = 'SELECT a.akte_id, a.person_id, @@ -130,21 +118,13 @@ class Akte_model extends DB_Model } /** - * + * getAktenAcceptedDms */ public function getAktenAcceptedDms($person_id, $dokument_kurzbz = null) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('campus.tbl_dms', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('campus.tbl_dms_version', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + if (isError($ent = $this->isEntitled('campus.tbl_dms', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $query = 'SELECT a.akte_id, a.person_id, @@ -193,4 +173,4 @@ class Akte_model extends DB_Model return $this->execQuery($query, $parametersArray); } -} \ No newline at end of file +} diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php index 720c976e6..001df404b 100644 --- a/application/models/crm/Dokumentprestudent_model.php +++ b/application/models/crm/Dokumentprestudent_model.php @@ -12,10 +12,13 @@ class Dokumentprestudent_model extends DB_Model $this->pk = array('prestudent_id', 'dokument_kurzbz'); } + /** + * setAccepted + */ public function setAccepted($prestudent_id, $studiengang_kz) { - if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $result = null; @@ -41,10 +44,13 @@ class Dokumentprestudent_model extends DB_Model return $result; } + /** + * setAcceptedDocuments + */ public function setAcceptedDocuments($prestudent_id, $dokument_kurzbz) { - if (($isEntitled = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_dokumentprestudent', PermissionLib::INSERT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $result = null; @@ -68,4 +74,4 @@ class Dokumentprestudent_model extends DB_Model return $result; } -} \ No newline at end of file +} diff --git a/application/models/crm/Dokumentstudiengang_model.php b/application/models/crm/Dokumentstudiengang_model.php index e96bd6e55..697920409 100644 --- a/application/models/crm/Dokumentstudiengang_model.php +++ b/application/models/crm/Dokumentstudiengang_model.php @@ -12,11 +12,13 @@ class Dokumentstudiengang_model extends DB_Model $this->pk = array('studiengang_kz', 'dokument_kurzbz'); } + /** + * getDokumentstudiengangByStudiengang_kz + */ public function getDokumentstudiengangByStudiengang_kz($studiengang_kz, $onlinebewerbung = null, $pflicht = null, $nachreichbar = null) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_dokument', 's', FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_dokument', 's', FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $this->addJoin('public.tbl_dokument', 'dokument_kurzbz'); @@ -39,4 +41,4 @@ class Dokumentstudiengang_model extends DB_Model return $this->loadWhere($parameterArray); } -} \ No newline at end of file +} diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 39ad17da5..7e05eeccd 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -13,17 +13,15 @@ class Prestudent_model extends DB_Model } /** - * @return void + * getLastStatuses */ public function getLastStatuses($person_id, $studiensemester_kurzbz = null, $studiengang_kz = null, $status_kurzbz = null) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + if (isError($ent = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $query = 'SELECT * FROM public.tbl_prestudent p @@ -60,7 +58,7 @@ class Prestudent_model extends DB_Model } /** - * + * updateAufnahmegruppe */ public function updateAufnahmegruppe($prestudentIdArray, $aufnahmegruppe) { @@ -85,8 +83,12 @@ class Prestudent_model extends DB_Model * - stufe and aufnahmegruppe * - reihungstest score */ - public function getPrestudentMultiAssign($studiengang = null, $studiensemester = null, $gruppe = null, $reihungstest = null, $stufe = null) + public function getPrestudentMultiAssign( + $studiengang = null, $studiensemester = null, $gruppe = null, $reihungstest = null, $stufe = null + ) { + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + $this->addSelect( 'p.person_id, prestudent_id, diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index beb5eb845..75f0269c5 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -14,17 +14,15 @@ class Prestudentstatus_model extends DB_Model } /** - * @return void + * getLastStatus */ public function getLastStatus($prestudent_id, $studiensemester_kurzbz = '', $status_kurzbz = '') { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('lehre.tbl_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + if (isError($ent = $this->isEntitled('lehre.tbl_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $query = 'SELECT tbl_prestudentstatus.*, bezeichnung AS studienplan_bezeichnung, @@ -53,10 +51,12 @@ class Prestudentstatus_model extends DB_Model } /** - * + * updateStufe */ public function updateStufe($prestudentIdArray, $stufe) { + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + return $this->execQuery( 'UPDATE public.tbl_prestudentstatus SET rt_stufe = ? @@ -82,8 +82,8 @@ class Prestudentstatus_model extends DB_Model public function getStatusByFilter($prestudent_id, $status_kurzbz = '', $ausbildungssemester = '', $studiensemester_kurzbz = '') { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $query = ' SELECT diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php index 39b1249a2..a15191eab 100644 --- a/application/models/organisation/Studiengang_model.php +++ b/application/models/organisation/Studiengang_model.php @@ -13,15 +13,14 @@ class Studiengang_model extends DB_Model } /** - * + * getAllForBewerbung */ public function getAllForBewerbung() { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('lehre.vw_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('bis.tbl_lgartcode', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + if (isError($ent = $this->isEntitled('bis.tbl_lgartcode', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + if (isError($ent = $this->isEntitled('lehre.vw_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $allForBewerbungQuery = 'SELECT DISTINCT studiengang_kz, typ, @@ -100,10 +99,12 @@ class Studiengang_model extends DB_Model } /** - * + * getStudienplan */ public function getStudienplan($studiensemester_kurzbz, $ausbildungssemester, $aktiv, $onlinebewerbung) { + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + // Join table public.tbl_studiengang with table lehre.tbl_studienordnung on column studiengang_kz $this->addJoin('lehre.tbl_studienordnung', 'studiengang_kz'); // Then join with table lehre.tbl_studienplan on column studienordnung_id @@ -135,10 +136,12 @@ class Studiengang_model extends DB_Model } /** - * + * getStudiengangBewerbung */ public function getStudiengangBewerbung() { + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + // Join table public.tbl_studiengang with table lehre.tbl_studienordnung on column studiengang_kz $this->addJoin('lehre.tbl_studienordnung', 'studiengang_kz'); // Join table lehre.tbl_studienordnung with table lehre.tbl_akadgrad on column akadgrad_id @@ -150,7 +153,8 @@ class Studiengang_model extends DB_Model // Then join with table lehre.tbl_bewerbungsfrist on column studiensemester_kurzbz $this->addJoin( 'public.tbl_bewerbungstermine', - 'tbl_bewerbungstermine.studiensemester_kurzbz = ss.studiensemester_kurzbz AND tbl_bewerbungstermine.studienplan_id = ss.studienplan_id', + 'tbl_bewerbungstermine.studiensemester_kurzbz = ss.studiensemester_kurzbz + AND tbl_bewerbungstermine.studienplan_id = ss.studienplan_id', 'LEFT' ); // Ordering by studiengang_kz and studienplan_id @@ -166,7 +170,9 @@ class Studiengang_model extends DB_Model 'public.tbl_studiengang.aktiv = TRUE AND public.tbl_studiengang.onlinebewerbung = TRUE AND ((tbl_bewerbungstermine.beginn <= NOW() AND tbl_bewerbungstermine.ende >= NOW()) OR tbl_bewerbungstermine.beginn IS NULL) - AND ss.studiensemester_kurzbz IN (SELECT DISTINCT studiensemester_kurzbz FROM public.tbl_bewerbungstermine WHERE beginn <= NOW() AND ende >= NOW()) + AND ss.studiensemester_kurzbz IN ( + SELECT DISTINCT studiensemester_kurzbz FROM public.tbl_bewerbungstermine WHERE beginn <= NOW() AND ende >= NOW() + ) AND ss.semester = 1 AND lehre.tbl_studienplan.aktiv = TRUE' , @@ -180,10 +186,12 @@ class Studiengang_model extends DB_Model } /** - * + * getAppliedStudiengang */ public function getAppliedStudiengang($person_id, $studiensemester_kurzbz, $titel) { + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + // Then join with table public.tbl_prestudent $this->addJoin('public.tbl_prestudent', 'studiengang_kz'); // Join table public.tbl_prestudentstatus @@ -227,10 +235,12 @@ class Studiengang_model extends DB_Model } /** - * + * getAppliedStudiengangFromNow */ public function getAppliedStudiengangFromNow($person_id, $titel) { + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; + // Then join with table public.tbl_prestudent $this->addJoin('public.tbl_prestudent', 'studiengang_kz'); // Join table public.tbl_prestudentstatus @@ -278,20 +288,20 @@ class Studiengang_model extends DB_Model } /** - * + * getAvailableReihungstestByPersonId */ public function getAvailableReihungstestByPersonId($person_id) { - if (($isEntitled = $this->isEntitled('lehre.tbl_studienordnung', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('lehre.tbl_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_reihungstest', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('lehre.tbl_studienplan', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_reihungstest', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('lehre.tbl_studienordnung', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $this->addJoin('lehre.tbl_studienordnung', 'studiengang_kz'); @@ -334,4 +344,4 @@ class Studiengang_model extends DB_Model array('reihungstest') ); } -} \ No newline at end of file +} diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php index 1c5119b2a..e3c1261ca 100644 --- a/application/models/organisation/Studiensemester_model.php +++ b/application/models/organisation/Studiensemester_model.php @@ -13,11 +13,13 @@ class Studiensemester_model extends DB_Model $this->hasSequence = false; } + /** + * getLastOrAktSemester + */ public function getLastOrAktSemester($days = 60) { // Checks rights - if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; if (!is_numeric($days)) { @@ -33,11 +35,13 @@ class Studiensemester_model extends DB_Model return $this->execQuery($query); } + /** + * getNextFrom + */ public function getNextFrom($studiensemester_kurzbz) { // Checks rights - if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $query = 'SELECT studiensemester_kurzbz, start, @@ -55,13 +59,13 @@ class Studiensemester_model extends DB_Model } /** - * @return void + * getNearest */ public function getNearest($semester = '') { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.vw_studiensemester', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.vw_studiensemester', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $query = 'SELECT studiensemester_kurzbz, start, @@ -86,4 +90,4 @@ class Studiensemester_model extends DB_Model return $this->execQuery($query); } -} \ No newline at end of file +} diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php index 8298c0d1e..2ea9d4d25 100644 --- a/application/models/person/Person_model.php +++ b/application/models/person/Person_model.php @@ -12,28 +12,31 @@ class Person_model extends DB_Model $this->pk = 'person_id'; } + /** + * getPersonKontaktByZugangscode + */ public function getPersonKontaktByZugangscode($zugangscode, $email) { $this->addJoin('public.tbl_kontakt', 'person_id'); - + return $this->loadWhere(array('zugangscode' => $zugangscode, 'kontakt' => $email)); } /** - * + * checkBewerbung */ public function checkBewerbung($email, $studiensemester_kurzbz = null) { - if (($isEntitled = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_benutzer', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_benutzer', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $checkBewerbungQuery = ''; $parametersArray = array($email, $email, $email); @@ -67,6 +70,9 @@ class Person_model extends DB_Model return $this->execQuery($checkBewerbungQuery, $parametersArray); } + /** + * updatePerson + */ public function updatePerson($person) { if (isset($person['svnr']) && $person['svnr'] != '') @@ -93,15 +99,15 @@ class Person_model extends DB_Model } /** - * @return void + * getPersonFromStatus */ public function getPersonFromStatus($status_kurzbz, $von, $bis) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_prestudent', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_prestudentstatus', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $this->addJoin('public.tbl_prestudent', 'person_id'); @@ -129,5 +135,4 @@ class Person_model extends DB_Model return $result; } - } diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php index 0cb3162c2..76e86b356 100644 --- a/application/models/system/Message_model.php +++ b/application/models/system/Message_model.php @@ -20,12 +20,12 @@ class Message_model extends DB_Model public function getMessagesByPerson($person_id, $all) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $sql = 'SELECT m.message_id, m.person_id, @@ -68,7 +68,7 @@ class Message_model extends DB_Model } /** - * + * getMessageVars */ public function getMessageVars() { @@ -85,7 +85,7 @@ class Message_model extends DB_Model } /** - * + * getMsgVarsDataByPrestudentId */ public function getMsgVarsDataByPrestudentId($prestudent_id) { @@ -93,4 +93,4 @@ class Message_model extends DB_Model return $this->execQuery(sprintf($query, is_array($prestudent_id) ? 'IN' : '='), array($prestudent_id)); } -} \ No newline at end of file +} diff --git a/application/models/system/Phrase_model.php b/application/models/system/Phrase_model.php index 13ae9aa19..775940a0c 100644 --- a/application/models/system/Phrase_model.php +++ b/application/models/system/Phrase_model.php @@ -13,15 +13,15 @@ class Phrase_model extends DB_Model } /** - * + * getPhrases */ public function getPhrases($app, $sprache, $phrase = null, $orgeinheit_kurzbz = null, $orgform_kurzbz = null) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('system.tbl_phrase', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('system.tbl_phrasentext', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('system.tbl_phrase', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('system.tbl_phrasentext', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; $parametersArray = array('app' => $app, 'sprache' => $sprache); @@ -60,4 +60,4 @@ class Phrase_model extends DB_Model return $this->execQuery($query, $parametersArray); } -} \ No newline at end of file +} diff --git a/application/models/system/Recipient_model.php b/application/models/system/Recipient_model.php index a76382925..b8ffecab3 100644 --- a/application/models/system/Recipient_model.php +++ b/application/models/system/Recipient_model.php @@ -12,22 +12,22 @@ class Recipient_model extends DB_Model $this->pk = array('person_id', 'message_id'); $this->hasSequence = false; } - + /** * Get data for a received message */ public function getMessage($message_id, $person_id) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - + if (isError($ent = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + $query = 'SELECT mr.message_id, mr.person_id, mm.subject, @@ -43,26 +43,26 @@ class Recipient_model extends DB_Model SELECT person_id, kontakt FROM public.tbl_kontakt WHERE kontakttyp = \'email\' ) ks ON (ks.person_id = mr.person_id) WHERE mr.message_id = ? AND mr.person_id = ?'; - + $parametersArray = array($message_id, $person_id); - + // Get data of the messages to sent return $this->execQuery($query, $parametersArray); } - + /** * Get a received message identified by token */ public function getMessageByToken($token) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - + if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + $sql = 'SELECT r.message_id, m.person_id as sender_id, r.person_id as receiver_id, @@ -80,25 +80,25 @@ class Recipient_model extends DB_Model ) s ON (r.message_id = s.message_id AND r.person_id = s.person_id) WHERE r.token = ? LIMIT 1'; - + return $this->execQuery($sql, array(MSG_STATUS_DELETED, $token)); } - + /** * Get all received messages for a person identified by person_id */ public function getMessagesByPerson($person_id, $all) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - + if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_person', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + $sql = 'SELECT DISTINCT ON (r.message_id) r.message_id, m.person_id, m.subject, @@ -126,9 +126,9 @@ class Recipient_model extends DB_Model ) s ON (m.message_id = s.message_id AND r.person_id = s.person_id) WHERE r.person_id = ? ORDER BY r.message_id DESC, s.status DESC'; - + $parametersArray = array($person_id); - + if ($all == 'true') { $sql = sprintf($sql, ''); @@ -138,10 +138,10 @@ class Recipient_model extends DB_Model array_push($parametersArray, $person_id, $person_id); $sql = sprintf($sql, 'WHERE person_id = ? AND message_id NOT IN (SELECT message_id FROM public.tbl_msg_status WHERE status >= 3 AND person_id = ?)'); } - + return $this->execQuery($sql, $parametersArray); } - + /** * Get all received messages for a person identified by uid */ @@ -152,14 +152,14 @@ class Recipient_model extends DB_Model // if same user if ($uid === getAuthUID()) { - if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; } // if different user, for reading messages from other users else { - if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; } // get Data @@ -188,18 +188,18 @@ class Recipient_model extends DB_Model SELECT * FROM public.tbl_msg_status ORDER BY insertamum DESC LIMIT 1 ) s ON (r.message_id = s.message_id AND r.person_id = s.person_id) WHERE b.uid = ?'; - + if (! $all) $sql .= ' AND (status < 3 OR status IS NULL)'; - + return $this->execQuery($sql, array($uid)); } - + /** * getMessages - * + * * Gets all the messages to be sent - * + * * @param kontaktType specifies the type of the kontakt to get * @param sent specifies the status of the messages to get (NULL never sent, otherwise the shipping date) * @param limit specifies the number of messages to get @@ -208,16 +208,17 @@ class Recipient_model extends DB_Model public function getMessages($kontaktType, $sent, $limit = null, $message_id = null) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - + if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_message', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_kontakt', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + $query = 'SELECT mm.message_id, ks.kontakt as sender, kr.kontakt as receiver, + mu.mitarbeiter_uid as employeeContact, mr.person_id as receiver_id, mr.token, mm.subject, @@ -229,10 +230,16 @@ class Recipient_model extends DB_Model ) ks ON (ks.person_id = mm.person_id) LEFT JOIN ( SELECT person_id, kontakt FROM public.tbl_kontakt WHERE kontakttyp = ? - ) kr ON (kr.person_id = mr.person_id)'; - + ) kr ON (kr.person_id = mr.person_id) + LEFT JOIN ( + SELECT b.person_id, + m.mitarbeiter_uid + FROM public.tbl_benutzer b INNER JOIN public.tbl_mitarbeiter m ON(b.uid = m.mitarbeiter_uid) + WHERE b.aktiv = TRUE + ) mu ON (mu.person_id = mr.person_id)'; + $parametersArray = array($kontaktType, $kontaktType); - + if (is_null($sent) || $sent == '') { $query .= ' WHERE mr.sent IS NULL'; @@ -242,35 +249,35 @@ class Recipient_model extends DB_Model array_push($parametersArray, $sent); $query .= ' WHERE mr.sent = ?'; } - + if (!is_null($message_id)) { array_push($parametersArray, $message_id); $query .= ' AND mm.message_id = ?'; } - + $query .= ' ORDER BY mr.insertamum ASC'; - + if (!is_null($limit)) { $query .= ' LIMIT ?'; array_push($parametersArray, $limit); } - + return $this->execQuery($query, $parametersArray); } - + /** * Get all unread messages for a person identified by person_id */ public function getCountUnreadMessages($person_id) { // Checks if the operation is permitted by the API caller - if (($isEntitled = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - if (($isEntitled = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; - + if (isError($ent = $this->isEntitled('public.tbl_msg_recipient', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + if (isError($ent = $this->isEntitled('public.tbl_msg_status', PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) + return $ent; + $sql = 'SELECT COUNT(r.message_id) AS unreadMessages FROM public.tbl_msg_recipient r JOIN public.tbl_msg_status s ON (r.message_id = s.message_id AND r.person_id = s.person_id) @@ -283,9 +290,9 @@ class Recipient_model extends DB_Model WHERE r.person_id = ? AND s.status > ? )'; - + $parametersArray = array($person_id, MSG_STATUS_UNREAD, $person_id, MSG_STATUS_UNREAD); - + return $this->execQuery($sql, $parametersArray); } -} \ No newline at end of file +} diff --git a/application/models/system/Vorlage_model.php b/application/models/system/Vorlage_model.php index bca397825..380f26b99 100644 --- a/application/models/system/Vorlage_model.php +++ b/application/models/system/Vorlage_model.php @@ -12,14 +12,16 @@ class Vorlage_model extends DB_Model $this->pk = 'vorlage_kurzbz'; } + /** + * Returns mume types + */ public function getMimeTypes() { // Checks rights - if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $query = 'SELECT DISTINCT mimetype FROM public.tbl_vorlage ORDER BY mimetype'; return $this->execQuery($query); } -} \ No newline at end of file +} diff --git a/application/models/system/Vorlagedokument_model.php b/application/models/system/Vorlagedokument_model.php index 23c0de329..e557d6e4d 100644 --- a/application/models/system/Vorlagedokument_model.php +++ b/application/models/system/Vorlagedokument_model.php @@ -13,13 +13,12 @@ class Vorlagedokument_model extends DB_Model } /** - * + * loadDokumenteFromVorlagestudiengang */ public function loadDokumenteFromVorlagestudiengang($vorlagestudiengang_id) { // Checks rights - if (($isEntitled = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true) - return $isEntitled; + if (isError($ent = $this->isEntitled($this->dbTable, PermissionLib::SELECT_RIGHT, FHC_NORIGHT, FHC_MODEL_ERROR))) return $ent; $qry = 'SELECT vorlagedokument_id, sort, @@ -33,4 +32,4 @@ class Vorlagedokument_model extends DB_Model return $this->execQuery($qry, array($vorlagestudiengang_id)); } -} \ No newline at end of file +} diff --git a/application/views/system/aufnahme/prestudentMultiAssign.php b/application/views/system/aufnahme/prestudentMultiAssign.php index f90ea208c..2223f3386 100644 --- a/application/views/system/aufnahme/prestudentMultiAssign.php +++ b/application/views/system/aufnahme/prestudentMultiAssign.php @@ -1,323 +1,323 @@ -load->view("templates/header", array("title" => "Users manager", "jquery" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?> - - -
-
- - - - - - - -
- widgetlib->widget( - 'Studiengang_widget', - array(DropdownWidget::SELECTED_ELEMENT => $studiengang), - array('name' => 'studiengang', 'id' => 'studiengangFilter') - ); - ?> - - widgetlib->widget( - 'Studiensemester_widget', - array(DropdownWidget::SELECTED_ELEMENT => $studiensemester), - array('name' => 'studiensemester', 'id' => 'studiensemesterFilter') - ); - ?> - - widgetlib->widget( - 'Reihungstest_widget', - array( - DropdownWidget::SELECTED_ELEMENT => $reihungstest, - 'studiengang' => $studiengang, - 'studiensemester' => $studiensemester - ), - array('name' => 'reihungstest', 'id' => 'reihungstestFilter') - ); - ?> - - widgetlib->widget( - 'Aufnahmegruppe_widget', - array(DropdownWidget::SELECTED_ELEMENT => $aufnahmegruppe), - array('name' => 'aufnahmegruppe', 'id' => 'aufnahmegruppeFilter') - ); - ?> - - widgetlib->widget( - 'Stufe_widget', - array(DropdownWidget::SELECTED_ELEMENT => $stufe), - array('name' => 'stufe', 'id' => 'stufeFilter') - ); - ?> -
- - -
- -
- - - - - - - - - - - - - - - - - -
- Assign to: -
- widgetlib->widget( - 'Stufe_widget', - array('stufe' => $stufe), - array('name' => 'stufe', 'id' => 'stufeAssign') - ); - ?> -   - -
- widgetlib->widget( - 'Aufnahmegruppe_widget', - array('aufnahmegruppe' => $aufnahmegruppe), - array('name' => 'aufnahmegruppe', 'id' => 'aufnahmegruppeAssign') - ); - ?> -   - -
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Prestudent IDPerson IDVornameNachnameGeschlechtStudiengangOrgFormStudienplanGeburtsdatumEmailStufeGruppePunkte
- - - prestudent_id; ?> - - person_id; ?> - - vorname; ?> - - nachname; ?> - - geschlecht; ?> - - kurzbzlang; ?> - - orgform_kurzbz; ?> - - studienplan; ?> - - gebdatum; ?> - - email; ?> - - rt_stufe; ?> - - aufnahmegruppe_kurzbz; ?> - - punkte; ?> -
- -
-
- - - - - - -load->view("templates/footer"); ?> \ No newline at end of file +load->view("templates/header", array("title" => "Users manager", "jquery19" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?> + + +
+ + + + + + + + +
+ widgetlib->widget( + 'Studiengang_widget', + array(DropdownWidget::SELECTED_ELEMENT => $studiengang), + array('name' => 'studiengang', 'id' => 'studiengangFilter') + ); + ?> + + widgetlib->widget( + 'Studiensemester_widget', + array(DropdownWidget::SELECTED_ELEMENT => $studiensemester), + array('name' => 'studiensemester', 'id' => 'studiensemesterFilter') + ); + ?> + + widgetlib->widget( + 'Reihungstest_widget', + array( + DropdownWidget::SELECTED_ELEMENT => $reihungstest, + 'studiengang' => $studiengang, + 'studiensemester' => $studiensemester + ), + array('name' => 'reihungstest', 'id' => 'reihungstestFilter') + ); + ?> + + widgetlib->widget( + 'Aufnahmegruppe_widget', + array(DropdownWidget::SELECTED_ELEMENT => $aufnahmegruppe), + array('name' => 'aufnahmegruppe', 'id' => 'aufnahmegruppeFilter') + ); + ?> + + widgetlib->widget( + 'Stufe_widget', + array(DropdownWidget::SELECTED_ELEMENT => $stufe), + array('name' => 'stufe', 'id' => 'stufeFilter') + ); + ?> +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + +
+ Assign to: +
+ widgetlib->widget( + 'Stufe_widget', + array('stufe' => $stufe), + array('name' => 'stufe', 'id' => 'stufeAssign') + ); + ?> +   + +
+ widgetlib->widget( + 'Aufnahmegruppe_widget', + array('aufnahmegruppe' => $aufnahmegruppe), + array('name' => 'aufnahmegruppe', 'id' => 'aufnahmegruppeAssign') + ); + ?> +   + +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Prestudent IDPerson IDVornameNachnameGeschlechtStudiengangOrgFormStudienplanGeburtsdatumEmailStufeGruppePunkte
+ + + prestudent_id; ?> + + person_id; ?> + + vorname; ?> + + nachname; ?> + + geschlecht; ?> + + kurzbzlang; ?> + + orgform_kurzbz; ?> + + studienplan; ?> + + gebdatum; ?> + + email; ?> + + rt_stufe; ?> + + aufnahmegruppe_kurzbz; ?> + + punkte; ?> +
+ +
+
+ + + + + + +load->view("templates/footer"); ?> diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php index 4f4ea7427..b5424e09f 100644 --- a/application/views/system/messageWrite.php +++ b/application/views/system/messageWrite.php @@ -1,286 +1,286 @@ -load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?> - - - - - -
- - - - - - - - - - - - - -
- To: - - 1 && $i % 10 == 0) - { - echo '
'; - } - echo $receiver->Vorname . " " . $receiver->Nachname . "; "; - } - ?> -
- Subject:  - - subject; - } - ?> - -
- - - - - - - -
- Message:
- body; - } - ?> - - 		  - -
- Variables:
- -
- -
- - - - - - - -
- widgetlib->widget( - 'Vorlage_widget', - array('oe_kurzbz' => $oe_kurzbz, 'isAdmin' => $isAdmin), - array('name' => 'vorlage', 'id' => 'vorlageDnD') - ); - ?> - -   - - -
- -
- - 0) - { - ?> -
- Preview: -
-
- - - - - - - - - - -
- Recipient: - -   - Refresh -
-   -
- -
-
- - - prestudent_id . '">' . "\n"; - } - ?> - - - - - -
- - - - - -load->view("templates/footer"); ?> \ No newline at end of file +load->view("templates/header", array("title" => "MessageReply", "jquery19" => true, "tinymce" => true)); ?> + + + + + +
+ + + + + + + + + + + + + +
+ To: + + 1 && $i % 10 == 0) + { + echo '
'; + } + echo $receiver->Vorname . " " . $receiver->Nachname . "; "; + } + ?> +
+ Subject:  + + subject; + } + ?> + +
+ + + + + + + +
+ Message:
+ body; + } + ?> + + 		  + +
+ Variables:
+ +
+ +
+ + + + + + + +
+ widgetlib->widget( + 'Vorlage_widget', + array('oe_kurzbz' => $oe_kurzbz, 'isAdmin' => $isAdmin), + array('name' => 'vorlage', 'id' => 'vorlageDnD') + ); + ?> + +   + + +
+ +
+ + 0) + { + ?> +
+ Preview: +
+
+ + + + + + + + + + +
+ Recipient: + +   + Refresh +
+   +
+ +
+
+ + + prestudent_id . '">' . "\n"; + } + ?> + + + + + +
+ + + + + +load->view("templates/footer"); ?> diff --git a/application/views/system/phraseinhaltEdit.php b/application/views/system/phraseinhaltEdit.php index 76771f122..a0dd11eaa 100644 --- a/application/views/system/phraseinhaltEdit.php +++ b/application/views/system/phraseinhaltEdit.php @@ -91,12 +91,12 @@ function initTextile() { // use a simple timer to check if the textarea content has changed var value = $content.val(); - $preview.html(textile.convert(value)); + $preview.html(textile.parse(value)); setInterval(function () { var newValue = $content.val(); if (value != newValue) { value = newValue; - $preview.html(textile.convert(newValue)); // convert the textile to html + $preview.html(textile.parse(newValue)); // convert the textile to html } }, 500); }; diff --git a/application/views/templates/header.php b/application/views/templates/header.php index a1f042b7b..59ddde80f 100644 --- a/application/views/templates/header.php +++ b/application/views/templates/header.php @@ -2,7 +2,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; -!isset($jquery) ? $jquery = false : $jquery = $jquery; +!isset($jquery19) ? $jquery19 = false : $jquery19 = $jquery19; !isset($jqueryComposer) ? $jqueryComposer = false : $jqueryComposer = $jqueryComposer; !isset($jqueryui) ? $jqueryui = false : $jqueryui = $jqueryui; !isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes; @@ -19,7 +19,7 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; !isset($datepicker) ? $datepicker = false : $datepicker = $datepicker; if ($tablesort || $jquery_checkboxes || $jquery_custom) - $jquery = true; + $jquery19 = true; if($datepicker) $jqueryui = true; @@ -27,8 +27,8 @@ if($datepicker) if($jqueryui) $jqueryComposer = true; -if($jquery && $jqueryComposer) - show_error("Two JQuery versions used: composer and includefolderversion"); +if($jquery19 && $jqueryComposer) + show_error("Two JQuery versions used: composer and include folder version"); ?> @@ -42,7 +42,7 @@ if($jquery && $jqueryComposer) - + @@ -56,7 +56,7 @@ if($jquery && $jqueryComposer) - + @@ -93,7 +93,7 @@ if($jquery && $jqueryComposer) - + @@ -106,4 +106,4 @@ if($jquery && $jqueryComposer) - \ No newline at end of file + diff --git a/application/widgets/vorlage_widget.php b/application/widgets/Vorlage_widget.php similarity index 99% rename from application/widgets/vorlage_widget.php rename to application/widgets/Vorlage_widget.php index 91cba301f..f92b49fcd 100644 --- a/application/widgets/vorlage_widget.php +++ b/application/widgets/Vorlage_widget.php @@ -125,4 +125,4 @@ class Vorlage_widget extends DropdownWidget return $vorlage; } -} \ No newline at end of file +} diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php index 2b62094f1..b9d230ac6 100644 --- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php +++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php @@ -50,7 +50,7 @@ $summe_stud = 0; $summe_t2 = 0; $summe_komm = 0; $summe_ng = 0; - +$grades = array(); $sprache = getSprache(); $p = new phrasen($sprache); diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php index 67fc219a1..180da31de 100755 --- a/cis/private/profile/studienplan.php +++ b/cis/private/profile/studienplan.php @@ -353,7 +353,7 @@ function drawTree($tree, $depth) { global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext; global $datum_obj, $db, $lv_arr, $p, $note_pruef_arr, $student; - + foreach($tree as $row_tree) { $style=''; @@ -376,7 +376,8 @@ function drawTree($tree, $depth) break; case 'lv': $icon=' '; - $termine="Termine"; + if (!defined('CIS_STUDIENPLAN_LVPLANLINK_ANZEIGEN') || CIS_STUDIENPLAN_LVPLANLINK_ANZEIGEN) + $termine="Termine"; break; default: $icon=''; @@ -434,10 +435,10 @@ function drawTree($tree, $depth) echo ''; // Note zu dieser LV vorhanden? - + $lv_kompatibel = new lehrveranstaltung(); $kompatibleLVs = $lv_kompatibel->loadLVkompatibel($row_tree->lehrveranstaltung_id); - + if(isset($noten_arr[$row_tree->lehrveranstaltung_id])) { // Positive Note fuer diese LV vorhanden? @@ -447,7 +448,7 @@ function drawTree($tree, $depth) if($note_pruef_arr[$note]->positiv) $positiv=true; } - + if(!$positiv) { //echo ''.$p->t('studienplan/negativ').''; @@ -478,7 +479,7 @@ function drawTree($tree, $depth) else { echo ''.$p->t('studienplan/offen').''; - } + } } //check if compatible course has grade elseif(count($kompatibleLVs) > 0) @@ -526,15 +527,15 @@ function drawTree($tree, $depth) } elseif(count($kompatibleLVs) > 0) { - + $i = 0; while(!$found && $i < count($kompatibleLVs)) - { + { foreach($kompatibleLVs as $komp) { $anrechnung = new anrechnung(); $anrechnung->getAnrechnungPrestudent($student->prestudent_id, $row_tree->lehrveranstaltung_id, $komp); - + if(count($anrechnung->result) == 1) { $lv = $anrechnung->result[0]->lehrveranstaltung_id_kompatibel; @@ -582,7 +583,7 @@ function drawTree($tree, $depth) } } } - + foreach($lvkompatibel_arr as $row_lvid) { // Angebot der LV pruefen @@ -661,16 +662,16 @@ function drawTree($tree, $depth) function checkKompatibleLvs($kompatibleLVs, $student, $row_tree, $noten_arr, $note_pruef_arr, $p, $uid, $negativeNote= null) { - $positiv = false; + $positiv = false; $found = false; $i = 0; while(!$found && $i < count($kompatibleLVs)) - { + { foreach($kompatibleLVs as $komp) { $anrechnung = new anrechnung(); - $anrechnung->getAnrechnungPrestudent($student->prestudent_id, $row_tree->lehrveranstaltung_id, $komp); + $anrechnung->getAnrechnungPrestudent($student->prestudent_id, $row_tree->lehrveranstaltung_id, $komp); if(count($anrechnung->result) == 1) { diff --git a/composer.json b/composer.json index c2fdfe1f7..61434d88f 100755 --- a/composer.json +++ b/composer.json @@ -1,113 +1,146 @@ { - "name": "fh-complete/fhc-core", - "type": "app", - "description": "FH-Complete Core", - "keywords": ["fhc", "fh-complete", "campusmanagement"], - "homepage": "https://github.com/FH-Complete/FHC-Core", - "license": "GPLv3", - "authors": [ - { - "name": "Christian Paminger", - "email": "christian.paminger@fhcomplete.org", - "homepage": "http://fhcomplete.org" - }, - { - "name": "Andreas Österreicher", - "email": "oesi@technikum-wien.at", - "homepage": "http://fhcomplete.org" - }], - "support": - { - "email": "info@fhcomplete.org", - "forum": "https://plus.google.com/communities/113278802529782592610", - "wiki": "http://wiki.fhcomplete.org/" - }, - "repositories": [ - { - "type": "package", - "package": - { - "name": "codeigniter-restserver", - "version": "2.6", - "dist": - { - "url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip", - "type": "zip" - } + "name": "fh-complete/fhc-core", + "type": "app", + "description": "FH-Complete Core", + "keywords": [ + "fhc", + "fh-complete", + "campusmanagement" + ], + "homepage": "https://github.com/FH-Complete/FHC-Core", + "license": "GPLv3", + "authors": [ + { + "name": "Christian Paminger", + "email": "christian.paminger@fhcomplete.org", + "homepage": "http://fhcomplete.org" + }, + { + "name": "Andreas Österreicher", + "email": "oesi@technikum-wien.at", + "homepage": "http://fhcomplete.org" } + ], + "support": { + "email": "info@fhcomplete.org", + "forum": "https://plus.google.com/communities/113278802529782592610", + "wiki": "http://wiki.fhcomplete.org/" }, - { - "type": "package", - "package": - { - "name": "jsoneditor", - "version": "5.5.6", - "dist": - { - "url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip", - "type": "zip" + "repositories": [ + { + "type": "package", + "package": { + "name": "codeigniter-restserver", + "version": "2.6", + "dist": { + "url": "https://github.com/chriskacerguis/codeigniter-restserver/archive/master.zip", + "type": "zip" + } + } + }, + { + "type": "package", + "package": { + "name": "jsoneditor", + "version": "5.5.6", + "dist": { + "url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip", + "type": "zip" + } + } + }, + { + "type": "package", + "package": { + "name": "json-forms", + "version": "1.4.0", + "dist": { + "url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip", + "type": "zip" + } + } + }, + { + "type": "package", + "package": { + "name": "borgar/textile-js", + "version": "1.0", + "source": { + "url": "https://github.com/borgar/textile-js.git", + "type": "git", + "reference": "master" + } + } + }, + { + "type": "package", + "package": { + "name": "rmariuzzo/jquery-checkboxes", + "version": "1.0.7", + "source": { + "url": "https://github.com/rmariuzzo/checkboxes.js.git", + "type": "git", + "reference": "081cac1eb9b504dc32be27b57f32f6d1d29a5253" + } + } + }, + { + "type": "package", + "package": { + "name": "jquery/jquery1.9", + "version": "1.9.0", + "dist": { + "type": "file", + "url": "https://code.jquery.com/jquery-1.9.0.min.js" + } } } + ], + "require": { + "php": ">=5.4.0", + "codeigniter/framework": "3.*", + "codeigniter-restserver": "2.6", + "jsoneditor": "5.5.6", + "kingsquare/json-schema-form": "*", + "easyrdf/easyrdf": "0.9.*", + "ml/json-ld": "1.*", + "rougin/combustor": "1.1.*", + "rougin/refinery": "*", + "components/jquery": "2.1.4", + "components/jqueryui": "1.12.*", + "components/angular.js": "1.3.16", + "components/bootstrap": "3.3.5", + "michelf/php-markdown": "1.5.0", + "tinymce/tinymce": "4.*", + "zetacomponents/workflow": "1.*", + "zetacomponents/document": "1.*", + "zetacomponents/workflow-database-tiein": "1.*", + "zetacomponents/workflow-event-log-tiein": "1.*", + "json-forms": "1.4.0", + "wikimedia/composer-merge-plugin": "^1.3", + "fzaninotto/faker": "1.*", + "netcarver/textile": "^3.5", + "netcarver/textile": "^3.5", + "borgar/textile-js": "1.0", + "rmariuzzo/jquery-checkboxes": "1.0.7", + "jquery/jquery1.9": "1.9.0" + }, + "require-dev": { + "squizlabs/php_codesniffer": "2.*" + }, + "config": { + "bin-dir": "bin" }, - { - "type": "package", - "package": - { - "name": "json-forms", - "version": "1.4.0", - "dist": - { - "url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip", - "type": "zip" - } - } - } - ], - "require": - { - "php": ">=5.4.0", - "codeigniter/framework":"3.*", - "codeigniter-restserver": "2.6", - "jsoneditor": "5.5.6", - "kingsquare/json-schema-form": "*", - "easyrdf/easyrdf": "0.9.*", - "ml/json-ld": "1.*", - "rougin/combustor": "1.1.*", - "rougin/refinery": "*", - "components/jquery": "2.1.4", - "components/jqueryui": "1.12.*", - "components/angular.js": "1.3.16", - "components/bootstrap": "3.3.5", - "michelf/php-markdown": "1.5.0", - "tinymce/tinymce": "4.*", - "zetacomponents/workflow": "1.*", - "zetacomponents/document": "1.*", - "zetacomponents/workflow-database-tiein": "1.*", - "zetacomponents/workflow-event-log-tiein": "1.*", - "json-forms": "1.4.0", - "wikimedia/composer-merge-plugin": "^1.3", - "fzaninotto/faker": "1.*", - "netcarver/textile": "^3.5" - }, - "require-dev": - { - "squizlabs/php_codesniffer": "2.*" - }, - "config": - { - "bin-dir": "bin" - }, - "extra": { - "merge-plugin": { - "include": [ - "composer.json", - "addons/*/composer.json" - ], - "recurse": true, - "replace": false, - "merge-dev": false, - "merge-extra": false - } + "merge-plugin": { + "include": [ + "composer.json", + "addons/*/composer.json" + ], + "recurse": true, + "replace": false, + "merge-dev": false, + "merge-extra": false + } } } diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php index 7a12cc589..984d7c361 100644 --- a/config/global.config-default.inc.php +++ b/config/global.config-default.inc.php @@ -186,6 +186,7 @@ define('VILESCI_PERSON_NEU_STUDIENSEMESTER_WINTERONLY',false); // Anzeigeoptionen für den Studienplan im CIS define('CIS_STUDIENPLAN_SEMESTER_ANZEIGEN', false); +define('CIS_STUDIENPLAN_LVPLANLINK_ANZEIGEN',true); //Legt fest ob ein User zu einer LV angemeldet sein muss um Detailinformationen abrufen zu können. (true|false) define('CIS_LEHRVERANSTALTUNG_WENNANGEMELDET_DETAILS_ANZEIGEN', false); diff --git a/content/mitarbeiter/mitarbeiteroverlay.js.php b/content/mitarbeiter/mitarbeiteroverlay.js.php index ca5e07508..ee77e42af 100644 --- a/content/mitarbeiter/mitarbeiteroverlay.js.php +++ b/content/mitarbeiter/mitarbeiteroverlay.js.php @@ -623,7 +623,7 @@ function MitarbeiterAuswahl() // ***** Termine ***** document.getElementById('mitarbeiter-termine').setAttribute('src','termine.xul.php?mitarbeiter_uid='+uid); } - + // ***** UDF ***** if (document.getElementById('mitarbeiter-tabs').selectedItem == document.getElementById('mitarbeiter-tab-udf')) { @@ -915,56 +915,48 @@ function MitarbeiterNeu() } // **** -// * Exportiert die Daten in ein Excel File +// * Excel Export der Mitarbeiter // **** function MitarbeiterExport() { - var treeMitarbeiter=document.getElementById('mitarbeiter-tree'); - var treeMitarbeiterMenu=document.getElementById('tree-menu-mitarbeiter'); - var col = treeMitarbeiterMenu.columns ? treeMitarbeiterMenu.columns["tree-menu-mitarbeiter-col-filter"] : "tree-menu-mitarbeiter-col-filter"; - var filter=treeMitarbeiterMenu.view.getCellText(treeMitarbeiterMenu.currentIndex,col); - cols = treeMitarbeiter.getElementsByTagName('treecol'); - - var url = "content/statistik/mitarbeiterexport.xls.php"; - var attributes="?type=mitarbeiter"; - if (filter=="Studiengangsleiter") - attributes+="&stgl=true"; - if (filter=="Fachbereichsleiter") - attributes+="&fbl=true"; - if (filter=="Alle") - attributes+="&alle=true"; - if (filter=="Aktive") - attributes+="&aktiv=true"; - if (filter=="FixAngestellte") - attributes+="&fix=true&aktiv=true"; - if (filter=="FixAngestellteAlle") - attributes+="&fix=true"; - if (filter=="Inaktive") - attributes+="&aktiv=false"; - if (filter=="Karenziert") - attributes+="&karenziert=true"; - if (filter=="Ausgeschieden") - attributes+="&ausgeschieden=true"; - if (filter=="FreiAngestellte") - attributes+="&fix=false&aktiv=true"; - if (filter=="FreiAngestellteAlle") - attributes+="&fix=false"; - - url+=attributes; - spalte=0; - for(i in cols) + var tree = document.getElementById('mitarbeiter-tree'); + var data=''; + //Wenn nichts markiert wurde -> alle exportieren + if(tree.currentIndex==-1) { - if(cols[i].hidden==false) + if(tree.view) + var items = tree.view.rowCount; //Anzahl der Zeilen ermitteln + else + return false; + + for (var v=0; v < items; v++) { - url += "&spalte"+spalte+"="+MitarbeiterDetailgetSpaltenname(cols[i].id); - spalte=spalte+1; + var mitarbeiter_uid = getTreeCellText(tree, 'mitarbeiter-treecol-uid', v); + data = data+';'+mitarbeiter_uid; } } - //url+='&spalte0=titelpre&spalte1=vorname&spalte2=vornamen&spalte3=familienname&spalte4=uid'; + else + { + var start = new Object(); + var end = new Object(); + var numRanges = tree.view.selection.getRangeCount(); + var paramList= ''; + var anzahl=0; - //alert(url); - //window.open(url,"","chrome,status=no, modal, width=400, height=250, centerscreen, resizable"); - window.location.href=url; + //alle markierten personen holen + for (var t = 0; t < numRanges; t++) + { + tree.view.selection.getRangeAt(t,start,end); + for (var v = start.value; v <= end.value; v++) + { + mitarbeiter_uid = getTreeCellText(tree, 'mitarbeiter-treecol-uid', v); + data = data+';'+mitarbeiter_uid; + } + } + } + + action = 'content/statistik/mitarbeiterexport.xls.php'; + OpenWindowPost(action, data); } // **** @@ -1992,9 +1984,9 @@ function MitarbeiterUDFIFrameLoad() { //Ausgewaehlte person_id holen var person_id = getTreeCellText(tree, 'mitarbeiter-treecol-person_id', tree.currentIndex); - + url = 'udf.xul.php?person_id='+person_id; document.getElementById('mitarbeiter-udf').setAttribute('src', url); } catch(e) {} -} \ No newline at end of file +} diff --git a/content/mitarbeiter/mitarbeiteroverlay.xul.php b/content/mitarbeiter/mitarbeiteroverlay.xul.php index 2104471fe..51ac61ddf 100644 --- a/content/mitarbeiter/mitarbeiteroverlay.xul.php +++ b/content/mitarbeiter/mitarbeiteroverlay.xul.php @@ -66,7 +66,7 @@ echo ' - +