Archived
1
0

General improvements

This commit is contained in:
Marcel
2019-01-04 19:44:00 +01:00
parent 2d6fa02b85
commit 4dbcd05e87
187 changed files with 185 additions and 89511 deletions

View File

@@ -28,12 +28,15 @@ class File extends MY_Controller
$isThumb = isset($_GET['w']) || isset($_GET['h']);
$w = isset($_GET['w']) ? $_GET['w'] : false;
$h = isset($_GET['h']) ? $_GET['h'] : false;
$imagePath = pathinfo($file['path'], PATHINFO_DIRNAME) . '/' .
$basePath = str_replace('\\', DIRECTORY_SEPARATOR, $file['path']);
$basePath = str_replace('/', DIRECTORY_SEPARATOR, $basePath);
$imagePath = pathinfo($basePath, PATHINFO_DIRNAME) . '/' .
($isThumb ? 'thumbs/' : '') .
$file['name'] .
($w ? '_w' . $w : '') .
($h ? '_h' . $h : '') .
'.' . pathinfo($file['path'], PATHINFO_EXTENSION);
'.' . pathinfo($basePath, PATHINFO_EXTENSION);
$imagePath = str_replace('/', DIRECTORY_SEPARATOR, $imagePath);
if (!file_exists($imagePath)) {
if(!$isThumb)

View File

@@ -194,7 +194,6 @@
if ($username == $loginData['username'] || $username == $loginData['email']) {
$resetKey = $this->LoginModel->createForgetPasswordKey($loginData['username']);
// TODO: E-Mail send
$this->EmailModel->sendMail($loginData['email'], 'Passwort zurücksetzen auf KingOfDog.eu', 'password_reset', ['userHash' => base64_encode($loginData['username']), 'resetKey' => $resetKey]);
$notice['state'] = true;

View File

@@ -83,6 +83,8 @@
$this->GeneralModel->addContactMessage($email, $userID, $message);
$this->EmailModel->sendMail('contact@kingofdog.eu', "Neue Nachricht von $email", 'contact_message', ['email' => $email, 'message' => $message]);
$notice['type'] = true;
$notice['message'] = "Deine Nachricht wurde versendet!";
} else {