diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..78265bd --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "www/PHPMailer"] + path = www/PHPMailer + url = git@github.com:PHPMailer/PHPMailer.git diff --git a/www/PHPMailer b/www/PHPMailer new file mode 160000 index 0000000..1193eb9 --- /dev/null +++ b/www/PHPMailer @@ -0,0 +1 @@ +Subproject commit 1193eb9d280f046fb3726c0124ea171f216328fd diff --git a/www/postreport.php b/www/postreport.php new file mode 100644 index 0000000..4ec082c --- /dev/null +++ b/www/postreport.php @@ -0,0 +1,53 @@ +isSMTP(); +$mail->SMTPAuth = true; +$mail->Host = 'nephrowiki.de'; +$mail->Username = 'zaareloaded@nephrowiki.de'; +$mail->Password = 'ooZ1eiJa'; +// $mail->SMTPSecure = 'tls'; +$mail->Port = 25; + +$mail->From = 'zaareloaded@nephrowiki.de'; +$mail->FromName = 'zaaReloaded'; +$mail->addAddress('dk@doktorkraus.de'); +$mail->Subject = "[zaaReloaded] Exception $reportId"; + +if ( $_POST['ccUser'] ) { + $validMail = filter_var( $_POST['usersMail'], FILTER_VALIDATE_EMAIL ); + $validUser = filter_var( $_POST['usersName'], FILTER_SANITIZE_STRING ); + if ( $validUser ) { + $validUser = "\"$validUser\" "; // space character deliberately placed + }; + if ( $validMail ) { + $mail->addCC($validMail, $validUser); + }; +}; + +$info = print_r( $_POST, true ); + +$mail->Body = <<send()) +{ + // Must return the report ID to indicate success + echo($reportId); +} +else +{ + echo($mail->ErrorInfo); +} diff --git a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml index b61e024..64e6e0e 100755 --- a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml +++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml @@ -34,7 +34,7 @@ - + diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs index 2eef6aa..286e84d 100755 --- a/zaaReloaded2/ThisAddIn.cs +++ b/zaaReloaded2/ThisAddIn.cs @@ -26,6 +26,7 @@ using Office = Microsoft.Office.Core; using Microsoft.Office.Tools.Word; using Bovender.Versioning; using Bovender.Mvvm.Messaging; +using zaaReloaded2.ExceptionHandler; namespace zaaReloaded2 { @@ -46,6 +47,7 @@ namespace zaaReloaded2 private void ThisAddIn_Startup(object sender, System.EventArgs e) { + Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback; } private void ThisAddIn_Shutdown(object sender, System.EventArgs e) @@ -108,6 +110,16 @@ namespace zaaReloaded2 #endregion + #region Exception handler + + void CentralHandler_ManageExceptionCallback(object sender, Bovender.ExceptionHandler.ManageExceptionEventArgs e) + { + e.IsHandled = true; + ExceptionViewModel vm = new ExceptionViewModel(e.Exception); + vm.InjectInto().ShowDialog(); + } + #endregion + #region Private fields Ribbon _ribbon;