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

- Fixed Fallback if Vorlage doesnt exist

Browse Source 
- Added Additional Parameters to Message
This commit is contained in:
oesi
2016-08-19 11:31:30 +02:00
parent b46692913c
commit edb60ef17b
2 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+29 -8
View File
@@ -71,6 +71,7 @@ require_once('../../include/note.class.php');
require_once('../../include/standort.class.php');
require_once('../../include/adresse.class.php');
require_once('../../include/reihungstest.class.php');
require_once('../../include/studienplan.class.php');
$user = get_uid();
$db = new basis_db();
@@ -1025,10 +1026,10 @@ if(!$error)
$prestudent = new prestudent();
$prestudent->load($_POST['prestudent_id']);
$url =APP_ROOT.'/index.ci.php/api/v1/system/Message/MessageVorlage';
$url =APP_ROOT.'index.ci.php/api/v1/system/Message/MessageVorlage';
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL,$url);
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
$header=array();
$auth = base64_encode(FHC_REST_USER.':'.FHC_REST_PASSWORD);
@@ -1041,17 +1042,28 @@ if(!$error)
$studiengang->load($prestudent->studiengang_kz);
$studiengang->getAllTypes();
$orgform='';
if($rolle->studienplan_id!='')
{
$studienplan = new studienplan();
$studienplan->loadStudienplan($rolle->studienplan_id);
$orgform = $studienplan->orgform_kurzbz;
}
else
$orgform = $rolle->orgform_kurzbz;
$curl_post_data = array(
"sender_id" => 1, // TODO
"receiver_id" => $prestudent->person_id,
"oe_kurzbz" => $studiengang->oe_kurzbz,
"vorlage_kurzbz" => 'MailApplicationConfirmationInteressent',
"vorlage_kurzbz" => 'MailStatConfirm'.$_POST['status_kurzbz'],
"data" => array(
'typ'=>$studiengang->studiengang_typ_arr[$studiengang->typ],
'studiengang'=>$studiengang->bezeichnung,
'anrede'=>$prestudent->anrede,
'vorname'=>$prestudent->vorname,
'nachname'=>$prestudent->nachname,
'anrede'=>$prestudent->anrede
'typ'=>$studiengang->studiengang_typ_arr[$studiengang->typ],
'studiengang'=>$studiengang->bezeichnung,
'orgform'=>$orgform,
'stgMail'=>$studiengang->email
)
);
@@ -1061,8 +1073,17 @@ if(!$error)
$result = curl_exec($ch);
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
$return = true;
$jsonresult = json_decode($result);
if(isset($jsonresult->error) && $jsonresult->error==1)
{
$return = false;
$errormsg = $jsonresult->retval;
}
else
{
$return = true;
}
}
else
{