Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-27 17:59:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* small fix related to warning about news

Browse Source 
* fixed template path finding
* fixed news adding when type != ARTICLE
This commit is contained in:
slawkens1 2018-01-03 23:56:07 +01:00
parent 4c6af13574
commit 603495ca97
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/pages/news.php
View File

@ -387,7 +387,7 @@ class News
if(!self::verify($title, $body, $article_text, $article_image, $errors)) if(!self::verify($title, $body, $article_text, $article_image, $errors))
return false; return false;
$db->insert(TABLE_PREFIX . 'news', array('title' => $title, 'body' => $body, 'type' => $type, 'date' => time(), 'category' => $category, 'player_id' => isset($player_id) ? $player_id : 0, 'comments' => $comments, 'article_text' => $article_text, 'article_image' => $article_image)); $db->insert(TABLE_PREFIX . 'news', array('title' => $title, 'body' => $body, 'type' => $type, 'date' => time(), 'category' => $category, 'player_id' => isset($player_id) ? $player_id : 0, 'comments' => $comments, 'article_text' => ($type == 3 ? $article_text : ''), 'article_image' => ($type == 3 ? $article_image : '')));
return true; return true;
} }

24
system/template.php
View File

@ -15,42 +15,38 @@ if($config['template_allow_change'])
{ {
if(isset($_GET['template'])) if(isset($_GET['template']))
{ {
$template_name = $_GET['template'];
if(!preg_match("/[^A-z0-9_\-]/", $template_name)) { // validate template if(!preg_match("/[^A-z0-9_\-]/", $template_name)) { // validate template
//setcookie('template', $template_name, 0, BASE_DIR . '/', $_SERVER["SERVER_NAME"]); //setcookie('template', $template_name, 0, BASE_DIR . '/', $_SERVER["SERVER_NAME"]);
$template_name = $_GET['template'];
setSession('template', $template_name); setSession('template', $template_name);
header('Location:' . getSession('last_uri')); header('Location:' . getSession('last_uri'));
} }
else
$template_name = $config['template'];
} }
else { else {
$template_session = getSession('template'); $template_session = getSession('template');
if ($template_session !== false) { if ($template_session !== false) {
if (!preg_match("/[^A-z0-9_\-]/", $template_session)) { if (!preg_match("/[^A-z0-9_\-]/", $template_session)) {
$template_name = $template_session; $template_name = $template_session;
} else {
$template_name = $config['template'];
} }
} }
} }
} }
$template_path = 'templates/' . $template_name; $template_path = 'templates/' . $template_name;
if(!file_exists($template_path . '/index.php') && if(!file_exists(BASE . $template_path . '/index.php') &&
!file_exists($template_path . '/template.php') && !file_exists(BASE . $template_path . '/template.php') &&
!file_exists($template_path . '/layout.php')) !file_exists(BASE . $template_path . '/layout.php'))
{ {
$template_name = 'kathrine'; $template_name = 'kathrine';
$template_path = TEMPLATES . $template_name; $template_path = 'templates/' . $template_name;
} }
$file = $template_path . '/config.ini'; $file = BASE . $template_path . '/config.ini';
$exists = file_exists($file); $exists = file_exists($file);
if($exists || ($config['backward_support'] && file_exists($template_path . '/layout_config.ini'))) if($exists || ($config['backward_support'] && file_exists(BASE . $template_path . '/layout_config.ini')))
{ {
if(!$exists) if(!$exists)
$file = $template_path . '/layout_config.ini'; $file = BASE . $template_path . '/layout_config.ini';
if($cache->enabled()) if($cache->enabled())
{ {
@ -69,8 +65,8 @@ if($exists || ($config['backward_support'] && file_exists($template_path . '/lay
foreach($template_ini as $key => $value) foreach($template_ini as $key => $value)
$config[$key] = $value; $config[$key] = $value;
} }
else if(file_exists($template_path . '/config.php')) else if(file_exists(BASE . $template_path . '/config.php'))
require($template_path . '/config.php'); require(BASE . $template_path . '/config.php');
$template = array(); $template = array();
$template['link_account_manage'] = getLink('account/manage'); $template['link_account_manage'] = getLink('account/manage');

6
system/templates/news.add.html.twig
View File

@ -1,7 +1,7 @@
{% if action != 'edit' %} {% if action != 'edit' %}
<a id="news-button" href="#">Add news</a> <a id="news-button" href="#">Add news</a>
{% endif %} {% endif %}
<form method="post" action="{{ news_link_form }}"> <form method="post" action="{{ news_link_form }}" id="news-edit-form">
{% if action == 'edit' %} {% if action == 'edit' %}
<input type="hidden" name="id" value="{{ news_id }}" /> <input type="hidden" name="id" value="{{ news_id }}" />
{% endif %} {% endif %}
@ -171,6 +171,10 @@
window.location = '{{ news_link }}'; window.location = '{{ news_link }}';
}); });
$("#news-edit-form").submit(function( event ) {
unsaved = false;
});
lastContent = $("#body").val(); lastContent = $("#body").val();
}); });