diff --git a/application/controllers/File.php b/application/controllers/File.php index 27bdaa0..a17462e 100644 --- a/application/controllers/File.php +++ b/application/controllers/File.php @@ -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) diff --git a/application/controllers/Login.php b/application/controllers/Login.php index 23908d4..94e754b 100644 --- a/application/controllers/Login.php +++ b/application/controllers/Login.php @@ -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; diff --git a/application/controllers/Main.php b/application/controllers/Main.php index 3d10675..6a5f80a 100644 --- a/application/controllers/Main.php +++ b/application/controllers/Main.php @@ -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 { diff --git a/application/models/AdminModel.php b/application/models/AdminModel.php index dd6b813..5462438 100644 --- a/application/models/AdminModel.php +++ b/application/models/AdminModel.php @@ -73,5 +73,4 @@ class AdminModel extends CI_Model { { return $this->db->query('SELECT * FROM calendar')->result_array(); } - } diff --git a/application/models/EmailModel.php b/application/models/EmailModel.php index da09005..31e6720 100644 --- a/application/models/EmailModel.php +++ b/application/models/EmailModel.php @@ -1,8 +1,6 @@ /,prolog:/<\?[\w\W]+?\?>/,doctype://,cdata://i,tag:{pattern:/<\/?[^\s>\/=.]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/?[\da-z]{1,8};/i},c.hooks.add("wrap",function(a){"entity"===a.type&&(a.attributes.title=a.content.replace(/&/,"&"))}),c.languages.xml=c.languages.markup,c.languages.html=c.languages.markup,c.languages.mathml=c.languages.markup,c.languages.svg=c.languages.markup,c.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},c.languages.css.atrule.inside.rest=c.util.clone(c.languages.css),c.languages.markup&&(c.languages.insertBefore("markup","tag",{style:{pattern:/ - -
-