From 67d7deeffc1e180e65d3fef452bec2cc981a3ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 2 Mar 2018 11:35:42 +0100 Subject: [PATCH 01/16] Infocenter Spalten angepasst --- .../system/infocenter/infocenterData.php | 20 ++++++++++++++----- application/views/widgets/filter/filter.php | 4 ++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php index c68ccf83f..57851d70a 100644 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -83,7 +83,7 @@ ) AS "AnzahlAbgeschickt", array_to_string( ( - SELECT array_agg(distinct tbl_studiengang.kurzbzlang) + SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz)) FROM public.tbl_prestudentstatus pss INNER JOIN public.tbl_prestudent ps USING(prestudent_id) @@ -99,7 +99,7 @@ WHERE ende >= NOW() ) LIMIT 1 - ),\',\' + ),\', \' ) AS "StgAbgeschickt", pl.zeitpunkt AS "LockDate", pl.lockuser as "LockUser" @@ -141,6 +141,8 @@ 'hideSave' => false, 'checkboxes' => 'PersonId', 'additionalColumns' => array('Details'), + 'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Letzte Aktion','Letzter Bearbeiter', + 'StSem','GesendetAm','NumAbgeschickt','Studiengänge','Sperrdatum','GesperrtVon'), 'formatRaw' => function($datasetRaw) { $datasetRaw->{'Details'} = sprintf( @@ -153,10 +155,18 @@ { $datasetRaw->{'SendDate'} = 'Not sent'; } + else + { + $datasetRaw->{'SendDate'} = date_format(date_create($datasetRaw->{'SendDate'}),'Y-m-d H:i'); + } if ($datasetRaw->{'LastAction'} == null) { - $datasetRaw->{'LastAction'} = 'Not logged'; + $datasetRaw->{'LastAction'} = '-'; + } + else + { + $datasetRaw->{'LastAction'} = date_format(date_create($datasetRaw->{'LastAction'}),'Y-m-d H:i'); } if ($datasetRaw->{'User/Operator'} == '') @@ -166,12 +176,12 @@ if ($datasetRaw->{'LockDate'} == null) { - $datasetRaw->{'LockDate'} = 'Not locked'; + $datasetRaw->{'LockDate'} = '-'; } if ($datasetRaw->{'LockUser'} == null) { - $datasetRaw->{'LockUser'} = 'Not locked'; + $datasetRaw->{'LockUser'} = '-'; } if ($datasetRaw->{'StgAbgeschickt'} == null) diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php index 9ceeed48e..15b9b4b26 100644 --- a/application/views/widgets/filter/filter.php +++ b/application/views/widgets/filter/filter.php @@ -2,8 +2,8 @@ .filter-name-title { font-family: inherit; - font-size: 20px; - font-weight: bold; + font-size: 16px; + /*font-weight: bold;*/ line-height: 1.1; color: black; } From 99f075ee2f4f143b93357215636bc6a8446b8df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 2 Mar 2018 11:44:55 +0100 Subject: [PATCH 02/16] Link zu Onlinebewerbung korrigiert --- application/views/system/infocenter/stammdaten.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php index c666a3ac4..c3b14bd3e 100755 --- a/application/views/system/infocenter/stammdaten.php +++ b/application/views/system/infocenter/stammdaten.php @@ -102,7 +102,7 @@ zugangscode)): ?>
-  Zugang Bewerbung
From a999c8bf0132c41c94d557c3f6bfe0e5a86b539a Mon Sep 17 00:00:00 2001 From: Paolo Date: Fri, 2 Mar 2018 12:29:55 +0100 Subject: [PATCH 03/16] FilterWidget bugfix: correct generation of selectedFiltersAliases in method selectFilters of controller system/Filters --- application/controllers/system/Filters.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/system/Filters.php b/application/controllers/system/Filters.php index 6d008ede7..fe8ecaaec 100644 --- a/application/controllers/system/Filters.php +++ b/application/controllers/system/Filters.php @@ -125,10 +125,10 @@ class Filters extends VileSci_Controller if ($pos !== false) { - $json->selectedFiltersAliases[] = $json->selectedFilters[$i]; + $json->selectedFiltersAliases[$i] = $json->selectedFilters[$i]; if ($json->allColumnsAliases != null && is_array($json->allColumnsAliases)) { - $json->selectedFiltersAliases[] = $json->allColumnsAliases[$pos]; + $json->selectedFiltersAliases[$i] = $json->allColumnsAliases[$pos]; } $json->selectedFiltersMetaData[] = $metaData[$pos]; From 237f6530b6ec6e98ea70f26741318f5d55c55325 Mon Sep 17 00:00:00 2001 From: Paolo Date: Fri, 2 Mar 2018 12:53:37 +0100 Subject: [PATCH 04/16] FilterWidget bugfix: correct generation of array columnsAliases in method sortSelectedFields of controller system/Filters --- application/controllers/system/Filters.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/application/controllers/system/Filters.php b/application/controllers/system/Filters.php index fe8ecaaec..cda080a46 100644 --- a/application/controllers/system/Filters.php +++ b/application/controllers/system/Filters.php @@ -74,25 +74,33 @@ class Filters extends VileSci_Controller $allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields']; $allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases']; + $json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields']; + $json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases']; + if (isset($selectedFieldsLst) && is_array($selectedFieldsLst)) { - $json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'] = $selectedFieldsLst; + $json->selectedFields = $selectedFieldsLst; + $json->columnsAliases = array(); for ($i = 0; $i < count($json->selectedFields); $i++) { $pos = array_search($json->selectedFields[$i], $allSelectedFields); + $json->columnsAliases[$i] = $json->selectedFields[$i]; + if ($pos !== false) { - $json->columnsAliases[] = $json->selectedFields[$i]; if ($allColumnsAliases != null && is_array($allColumnsAliases)) { - $json->columnsAliases[] = $allColumnsAliases[$pos]; + $json->columnsAliases[$i] = $allColumnsAliases[$pos]; } } } } + $_SESSION[self::SESSION_NAME]['selectedFields'] = $json->selectedFields; + $_SESSION[self::SESSION_NAME]['columnsAliases'] = $json->columnsAliases; + $this->output->set_content_type('application/json')->set_output(json_encode($json)); } From c534d101ae1a78c98800a937b49b82d1bed494d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 2 Mar 2018 16:22:38 +0100 Subject: [PATCH 05/16] Addon Update Permissions for Web User to Set Message Status --- system/dbupdate_3.3.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php index 7831171ea..5bbd920e0 100644 --- a/system/dbupdate_3.3.php +++ b/system/dbupdate_3.3.php @@ -1343,6 +1343,20 @@ if($result = @$db->db_query("SELECT * FROM information_schema.role_table_grants } } +// INSERT Berechtigungen fuer web User erteilen fuer tbl_msg_status +if($result = @$db->db_query("SELECT * FROM information_schema.role_table_grants WHERE table_name='tbl_msg_status' AND table_schema='public' AND grantee='web' AND privilege_type='UPDATE'")) +{ + if($db->db_num_rows($result)==0) + { + $qry = "GRANT UPDATE ON public.tbl_msg_status TO web;"; + + if(!$db->db_query($qry)) + echo 'public.tbl_msg_status Berechtigungen: '.$db->db_last_error().'
'; + else + echo 'UPDATE Rechte fuer public.tbl_msg_status fuer web user gesetzt '; + } +} + /** * Kommentare fuer Datenbanktabellen */ From 3fa86d9746e9a89b7a78ef80823d0fb4bb74b28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 2 Mar 2018 16:39:46 +0100 Subject: [PATCH 06/16] Added Default Filter for Infocenter --- system/dbupdate_3.3.php | 82 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php index 5bbd920e0..aa29445e3 100644 --- a/system/dbupdate_3.3.php +++ b/system/dbupdate_3.3.php @@ -1682,7 +1682,89 @@ if($result = $db->db_query("SELECT obj_description('public.ci_apikey'::regclass) else echo 'Kommentare fuer DB Datenbanktabellen hinzugefügt'; } + } +} +if($result = @$db->db_query("SELECT * FROM system.tbl_filters WHERE filter_kurzbz='InfoCenterSentApplicationAll' AND app='infocenter'")) +{ + if($db->db_num_rows($result)==0) + { + $qry = "INSERT INTO system.tbl_filters(app, dataset_name, filter_kurzbz, person_id, description, sort, + default_filter, filter, oe_kurzbz) + VALUES ('infocenter', 'PersonActions', 'InfoCenterSentApplicationAll', NULL, '{Alle}', 1, false, + '{\"name\": \"Abgeschickt - Alle\", \"columns\": [{\"name\": \"Vorname\"}, + {\"name\": \"Nachname\"}, {\"name\": \"LastAction\"}, {\"name\": \"LockUser\"}, + {\"name\": \"Studiensemester\"}, {\"name\": \"SendDate\"}, {\"name\": \"StgAbgeschickt\"}], + \"filters\": [{\"name\": \"AnzahlAbgeschickt\", \"option\": \"\", + \"condition\": \"0\", \"operation\": \"gt\"}]}', NULL);"; + if(!$db->db_query($qry)) + echo 'Filter: '.$db->db_last_error().'
'; + else + echo '
Filter InfoCenterSentApplicationAll hinzugefuegt'; + } +} + +if($result = @$db->db_query("SELECT * FROM system.tbl_filters WHERE filter_kurzbz='InfoCenterSentApplication3days' AND app='infocenter'")) +{ + if($db->db_num_rows($result)==0) + { + $qry = "INSERT INTO system.tbl_filters(app, dataset_name, filter_kurzbz, person_id, description, sort, + default_filter, filter, oe_kurzbz) + VALUES ('infocenter', 'PersonActions', 'InfoCenterSentApplication3days', NULL, + '{\"3 Tage keine Aktion\"}', 2, false, '{\"name\": \"Abgeschickt - 3 Tage keine Aktion\", + \"columns\": [{\"name\": \"Vorname\"}, {\"name\": \"Nachname\"}, {\"name\": \"LastAction\"}, + {\"name\": \"LockUser\"}, {\"name\": \"Studiensemester\"}, {\"name\": \"SendDate\"}, + {\"name\": \"StgAbgeschickt\"}], + \"filters\": [{\"name\": \"LastAction\", \"option\": \"days\", \"condition\": \"3\", + \"operation\": \"gt\"}, {\"name\": \"AnzahlAbgeschickt\", \"option\": \"\", + \"condition\": \"0\", \"operation\": \"gt\"}]}', NULL);"; + + if(!$db->db_query($qry)) + echo 'Filter: '.$db->db_last_error().'
'; + else + echo '
Filter InfoCenterSentApplication3days hinzugefuegt'; + } +} + +if($result = @$db->db_query("SELECT * FROM system.tbl_filters WHERE filter_kurzbz='InfoCenterNotSentApplicationAll' AND app='infocenter'")) +{ + if($db->db_num_rows($result)==0) + { + $qry = "INSERT INTO system.tbl_filters(app, dataset_name, filter_kurzbz, person_id, description, sort, + default_filter, filter, oe_kurzbz) + VALUES ('infocenter', 'PersonActions', 'InfoCenterNotSentApplicationAll', NULL, '{Alle}', 1, false, + '{\"name\": \"Nicht abgeschickt - Alle\", \"columns\": [{\"name\": \"Vorname\"}, + {\"name\": \"Nachname\"}, {\"name\": \"LastAction\"}, {\"name\": \"LockUser\"}, + {\"name\": \"Studiensemester\"}, {\"name\": \"SendDate\"}, {\"name\": \"StgAbgeschickt\"}], + \"filters\": [{\"name\": \"SendDate\", \"option\": \"\", + \"condition\": \"\", \"operation\": \"nset\"}]}', NULL);"; + + if(!$db->db_query($qry)) + echo 'Filter: '.$db->db_last_error().'
'; + else + echo '
Filter InfoCenterNotSentApplicationAll hinzugefuegt'; + } +} + +if($result = @$db->db_query("SELECT * FROM system.tbl_filters WHERE filter_kurzbz='InfoCenterNotSentApplication14Days' AND app='infocenter'")) +{ + if($db->db_num_rows($result)==0) + { + $qry = "INSERT INTO system.tbl_filters(app, dataset_name, filter_kurzbz, person_id, description, sort, + default_filter, filter, oe_kurzbz) + VALUES ('infocenter', 'PersonActions', 'InfoCenterNotSentApplication14Days', NULL, + '{\"14 Tage keine Aktion\"}', 2, false, '{\"name\": \"Nicht abgeschickt - 14 Tage keine Aktion\", + \"columns\": [{\"name\": \"Vorname\"}, {\"name\": \"Nachname\"}, {\"name\": \"LastAction\"}, + {\"name\": \"LockUser\"}, {\"name\": \"Studiensemester\"}, {\"name\": \"SendDate\"}, + {\"name\": \"StgAbgeschickt\"}], \"filters\": [{\"name\": \"LastAction\", \"option\": \"days\", + \"condition\": \"14\", \"operation\": \"gt\"}, {\"name\": \"SendDate\", \"option\": \"\", + \"condition\": \"\", \"operation\": \"nset\"}]}', NULL); + "; + + if(!$db->db_query($qry)) + echo 'Filter: '.$db->db_last_error().'
'; + else + echo '
Filter InfoCenterNotSentApplication14Days hinzugefuegt'; } } From ab7ffcf6867f0fba75ec04abdea4d7d273d5893e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Mon, 5 Mar 2018 08:21:15 +0100 Subject: [PATCH 07/16] Changelog angepasst --- CHANGELOG.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3c5c7b30..265334eda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,9 @@ - **[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 +- **[CORE]** UserDefinedFields hinzugefügt zur Verwalung von eigenen Eingabefeldern +- **[CORE]** Support für Extensions hinzugefügt - eine Weiterentwicklung der Addons für die Verwendung mit Codeigniter +- **[CORE]** Infocenter Seite hinzugefügt zur zentralen Verwaltung und ZGV Prüfung von Interessenten ### CHANGED - **[CORE]** Berechtigungsprüfung wurde angepasst damit deaktivierte Benutzer keine Berechtigungen mehr haben @@ -28,6 +30,18 @@ - **[CORE]** Update campus.tbl_templates (contentmittitel and contentohnetitel) with system/templates/contentmittitel_xslt_xhtml.xslt andsystem/templates/contentohnetitel_xslt_xhtml.xslt - **[CORE]** Neue Style Anweisungen (div.header_logo, td.headerbar, div.cis_logo) müssen in Custom Stylesheet hinzugefügt werden +### Deprecated +- **[CORE]** Die folgenden Datenbank Tabellen und Spalten wurden als DEPRECATED markiert und werden mit der nächsten Version entfernt: + public.tbl_aufnahmeschluessel, public.tbl_aufnahmetermin, public.tbl_aufnahmetermintyp, public.tbl_preinteressent, + public.tbl_preinteressentstudiengang, campus.tbl_feedback, campus.tbl_lvinfo, campus.tbl_resturlaub, lehre.tbl_lehrfach + lehre.tbl_lehrmittel, lehre.tbl_moodle, lehre.tbl_moodle_version, lehre.tbl_studienordnung_semester, lehre.tbl_zeitfenster + lehre.tbl_zeugnis, fue.tbl_scrumsprint, fue.tbl_scrumteam, wawi.tbl_aufteilung, wawi.tbl_aufteilung_default, + testtool.tbl_kategorie, testtool.tbl_kriterien, public.tbl_prestudent.rt_punkte1, public.tbl_prestudent.rt_punkte2 + public.tbl_prestudent.rt_punkte3, public.tbl_prestudent.anmeldungreihungstest, public.tbl_prestudent.reihungstest_id + public.tbl_prestudent.ausstellungsstaat, public.tbl_prestudent.aufnahmeschluessel, lehre.tbl_lehrveranstaltung.old_lehrfach_id +- **[CORE]** LV-Infos werden mit der kommenden Version aus dem Core entfernt - Dies ist jetzt ein Addon +- **[CORE]** WaWi wird mit der kommenden Version aus dem Core entfernt- Dies ist jetzt ein Addon + ## [3.2] ### Added From 005739a0935012e75d43caa436bf9da89adf9ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Mon, 5 Mar 2018 18:56:06 +0100 Subject: [PATCH 08/16] Fehler behoben wodurch doppelte oder leere MessageVorlagen angezeigt wurden --- application/widgets/Vorlage_widget.php | 39 +++++++++++++++----------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/application/widgets/Vorlage_widget.php b/application/widgets/Vorlage_widget.php index f92b49fcd..2bf8f95dc 100644 --- a/application/widgets/Vorlage_widget.php +++ b/application/widgets/Vorlage_widget.php @@ -7,9 +7,9 @@ class Vorlage_widget extends DropdownWidget // All organization units to which the user belongs $oe_kurzbz = $widgetData['oe_kurzbz']; $idAdmin = $widgetData['isAdmin']; - + $vorlage = null; - + // If the user is an admin if ($idAdmin === true) { @@ -23,17 +23,17 @@ class Vorlage_widget extends DropdownWidget // organisation unit tree $vorlage = $this->_getUserVorlage($oe_kurzbz); } - + $this->setElementsArray( $vorlage, true, 'Select a vorlage...', 'No vorlage found' ); - + $this->loadDropDownView($widgetData); } - + /** * Get all the vorlage with mimetype = text/html */ @@ -41,12 +41,12 @@ class Vorlage_widget extends DropdownWidget { $this->load->model('system/Vorlage_model', 'VorlageModel'); $this->VorlageModel->addOrder('vorlage_kurzbz'); - + $this->addSelectToModel($this->VorlageModel, 'vorlage_kurzbz', 'bezeichnung'); - + return $this->VorlageModel->loadWhere(array('mimetype' => 'text/html')); } - + /** * Get all the vorlage that belongs to the organisation units of the user * and the parents of those organisation units until the root of the @@ -56,9 +56,9 @@ class Vorlage_widget extends DropdownWidget { // Loads library OrganisationseinheitLib $this->load->library('OrganisationseinheitLib'); - + $vorlage = success(array()); // Default value - + $table = '( SELECT v.vorlage_kurzbz, v.bezeichnung, vs.version, vs.oe_kurzbz, vs.aktiv, vs.subject, vs.text, v.mimetype FROM tbl_vorlagestudiengang vs INNER JOIN tbl_vorlage v USING(vorlage_kurzbz) @@ -70,7 +70,7 @@ class Vorlage_widget extends DropdownWidget AND templates.text IS NOT NULL AND templates.mimetype = \'text/html\''; $order_by = 'description ASC'; - + if (!is_array($oe_kurzbz)) { $vorlage = $this->organisationseinheitlib->treeSearchEntire( @@ -95,14 +95,20 @@ class Vorlage_widget extends DropdownWidget $order_by, $val ); - + // Everything is ok and data are inside if (hasData($tmpVorlage)) { // If it's the first vorlage copy it if (count($vorlage->retval) == 0) { - $vorlage->retval = $tmpVorlage->retval; + for ($j = 0; $j < count($tmpVorlage->retval); $j++) + { + if ($tmpVorlage->retval[$j]->id != '') + { + array_push($vorlage->retval, $tmpVorlage->retval[$j]); + } + } } else // checks for duplicates, if it's not already present push it into the array $vorlage->retval { @@ -110,7 +116,8 @@ class Vorlage_widget extends DropdownWidget { for ($j = 0; $j < count($tmpVorlage->retval); $j++) { - if ($vorlage->retval[$i]->_pk != $tmpVorlage->retval[$j]->_pk + if ($tmpVorlage->retval[$j]->id != '' + && $vorlage->retval[$i]->_pk != $tmpVorlage->retval[$j]->_pk && $vorlage->retval[$i]->_ppk != $tmpVorlage->retval[$j]->_ppk && $vorlage->retval[$i]->_jtpk != $tmpVorlage->retval[$j]->_jtpk) { @@ -122,7 +129,7 @@ class Vorlage_widget extends DropdownWidget } } } - + return $vorlage; - } + } } From 9362f56b63026d099a9a6c75192aa5e72dc596f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 6 Mar 2018 15:44:33 +0100 Subject: [PATCH 09/16] Modified Infocenter Filter --- application/views/system/infocenter/infocenterData.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php index 57851d70a..663e69ca6 100644 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -12,7 +12,7 @@ ( SELECT zeitpunkt FROM system.tbl_log - WHERE taetigkeit_kurzbz = \'bewerbung\' + WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\') AND person_id = p.person_id ORDER BY zeitpunkt DESC LIMIT 1 @@ -20,7 +20,7 @@ ( SELECT insertvon FROM system.tbl_log - WHERE taetigkeit_kurzbz = \'bewerbung\' + WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\') AND person_id = p.person_id ORDER BY zeitpunkt DESC LIMIT 1 @@ -135,7 +135,7 @@ ) ) ) - ORDER BY "LastAction" DESC + ORDER BY "LastAction" ASC ', 'hideHeader' => false, 'hideSave' => false, From 3c7336a910dbc981434c42949381b6df76e14591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 6 Mar 2018 16:27:22 +0100 Subject: [PATCH 10/16] =?UTF-8?q?Infomails=20=C3=BCber=20neue=20Messages?= =?UTF-8?q?=20werden=20jetzt=20immer=20mit=20System-User=20versandt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/libraries/MessageLib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php index c07756c17..bed87d184 100644 --- a/application/libraries/MessageLib.php +++ b/application/libraries/MessageLib.php @@ -690,7 +690,7 @@ class MessageLib // Sending email $sent = $this->ci->maillib->send( - $sender, + null, $receiverContact, is_null($subject) ? $result->retval[0]->subject : $subject, // if parameter subject is not null, use it! $bodyMsg, From 56d2686e722d25c9ebf50a7017799ae1386762d0 Mon Sep 17 00:00:00 2001 From: Manfred Kindl Date: Tue, 6 Mar 2018 16:54:49 +0100 Subject: [PATCH 11/16] =?UTF-8?q?Infocenter=20Notiz=20Button=20f=C3=BCr=20?= =?UTF-8?q?Autotext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "Anmerkung zur Bewerbung"-Text wird automatisch eingefügt - "Select..."-Option bei Preview nur wenn mehr als 1 Empfänger --- .../views/system/infocenter/addNotiz.php | 18 ++++++++++++------ application/views/system/messageWrite.php | 6 ++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/application/views/system/infocenter/addNotiz.php b/application/views/system/infocenter/addNotiz.php index 8c5574344..8773b7cad 100644 --- a/application/views/system/infocenter/addNotiz.php +++ b/application/views/system/infocenter/addNotiz.php @@ -3,14 +3,20 @@
-
- +
+
+ +
+ +
+ +
+
+
- + +
diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php index d12193810..2b15cc12d 100644 --- a/application/views/system/messageWrite.php +++ b/application/views/system/messageWrite.php @@ -136,8 +136,10 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[