KingOfDog.de/old
Archived
1
0
Fork 0
Code Releases Activity

General improvements

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
application/controllers/File.php
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)

1
application/controllers/Login.php
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;

2
application/controllers/Main.php
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 {

1
application/models/AdminModel.php
View File

@@ -73,5 +73,4 @@ class AdminModel extends CI_Model {
{
return $this->db->query('SELECT * FROM calendar')->result_array();
}
}

2
application/models/EmailModel.php
View File

@@ -1,8 +1,6 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
use Coduo\PHPHumanizer\DateTimeHumanizer;
class EmailModel extends CI_Model
{

27
application/views/footer.php
View File

@@ -130,17 +130,22 @@
</script>
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//stats.kingofdog.eu/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '1']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
var _paq = _paq || [];
// require user consent before processing data
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function () {
var u = "//stats.kingofdog.eu/";
_paq.push(['setTrackerUrl', u + 'piwik.php']);
_paq.push(['setSiteId', '1']);
var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
g.type = 'text/javascript';
g.async = true;
g.defer = true;
g.src = u + 'piwik.js';
s.parentNode.insertBefore(g, s);
})();
</script>
<!--<script type="text/javascript">

2
application/views/home.php
View File

@@ -386,7 +386,7 @@
</div>
</div>
<button id="load-more-button" class="btn btn-default col-xs-6 col-xs-offset-3" onclick="loadPosts(false)"
data-loading="<i class='fa fa-cog fa-spin'></i> Lädt..."
data-loading="<div class='loadingSpinner'></div> Lädt..."
data-load="<i class='fa fa-ellipsis-h'></i> Mehr Posts laden">
<i class="fa fa-ellipsis-h"></i>
Mehr Posts laden