blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into StatusabhaengigerDokumentenupload

Browse Source
This commit is contained in:
Manfred Kindl
2019-07-26 13:53:39 +02:00
parent f9dcbbb6c9 9faa2e0077
commit b18d1576c1
5 changed files with 254 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dms.class.php
+2 -2
View File
@@ -746,13 +746,13 @@ class dms extends basis_db
JOIN campus.tbl_dms_version USING(dms_id)
JOIN campus.tbl_dms_kategorie USING (kategorie_kurzbz)";
// Wenn erstes Zeichen # ist, dieses wegkürzen und checken ob der Rest numerisch ist. Dann nach eindeutiger ID suchen
if (substr($suchstring, 0, 1) == '#')
/*if (substr($suchstring, 0, 1) == '#')
{
$suchstring = substr($suchstring, 1);
if (is_numeric($suchstring))
$qry .= " WHERE tbl_dms.dms_id = ".$this->db_add_param($suchstring, FHC_INTEGER);
}
else
else*/
{
$qry .= " WHERE lower(name) like lower('%".$this->db_escape($suchstring)."%')
OR lower(tbl_dms_version.beschreibung) like lower('%".$this->db_escape($suchstring)."%')
include/gruppe.class.php
+5
View File
@@ -649,6 +649,11 @@ class gruppe extends basis_db
*/
public function searchGruppen($searchItems, $aktiv = true, $limit = null)
{
if (!is_array($searchItems))
{
$this->errormsg = '$searchItems muss ein Array sein';
return false;
}
$qry = "SELECT
*
FROM