diff --git a/.htaccess b/.htaccess
index 7ae4da3..af2affa 100644
--- a/.htaccess
+++ b/.htaccess
@@ -24,8 +24,8 @@ RewriteRule my_chars.html index.php?task=rp&sub=chars [QSA,L]
RewriteRule canon_chars.html index.php?task=rp&sub=canons [QSA,L]
RewriteRule logs.html index.php?task=chat&sub=logs [QSA,L]
RewriteRule private.html index.php?task=chat&sub=privatelogs [QSA,L]
-RewriteRule ^text/guidelines.html$ /text/rules.html [R=301,L]
-RewriteRule ^text/(.*\.html?)$ index.php?task=text&url=$1 [L]
+RewriteRule ^guidelines.html$ /text/rules.html [R=301,L]
+RewriteRule ^(.*\.html?)$ index.php?task=text&url=$1 [L]
RewriteRule profile/(.*) index.php?task=rp&sub=show&name=$1
RewriteCond %{HTTP_HOST} ^chat\.coppertopia\.net$
@@ -49,4 +49,4 @@ RewriteCond %{HTTP_HOST} ^logs\.coppertopia\.net$
RewriteRule ^user/(.*)$ ?task=chat&sub=privatelogs&user=$1 [QSA,L]
RewriteCond %{HTTP_HOST} ^logs\.coppertopia\.net$
RewriteRule ^$ ?task=chat&sub=logs [QSA,L]
-
\ No newline at end of file
+
diff --git a/modules/text/admin/edit.apnl.php b/modules/text/admin/edit.apnl.php
index 8f9540b..1cd0eb4 100644
--- a/modules/text/admin/edit.apnl.php
+++ b/modules/text/admin/edit.apnl.php
@@ -45,7 +45,7 @@ class edit_text_panel extends admin_module{
$row = $db->fetch_array($result);
if($row["count"]==0){
- $db->query("UPDATE `" . $config["prefix"] . "article` SET `text`='".$db->escape($_POST["text"])."',`menue`='".$mid."',`title`='".$title."',`url`='".$url."',`rightnavi`='".$_POST["rightnavi"]."',`active`='".$_POST["active"]."',`eid`='".$session->userdata["uid"]."',`edittime`='".time()."' WHERE `id`='".$id."'");
+ $db->query("UPDATE `" . $config["prefix"] . "article` SET `text`='".$db->escape($_POST["text"])."',`menue`='".$mid."',`title`='".$title."',`url`='".$url."',`active`='".$_POST["active"]."',`eid`='".$session->userdata["uid"]."',`edittime`='".time()."' WHERE `id`='".$id."'");
$db->query("DELETE FROM `" . $config["prefix"] . "article_category` where `a_id`='".$id."'");
if($_POST["cats"]!=""){
foreach($_POST["cats"] as $nid){
diff --git a/modules/text/text.module.php b/modules/text/text.module.php
index e81392b..78c908d 100644
--- a/modules/text/text.module.php
+++ b/modules/text/text.module.php
@@ -28,7 +28,6 @@ class module_text extends admin_module{
`menue` int(11) NOT NULL default '0',
`title` varchar(80) NOT NULL default '',
`url` varchar(120) NOT NULL,
- `rightnavi` enum('false','true') NOT NULL,
`active` enum('true','false') NOT NULL,
PRIMARY KEY (`id`),
KEY `author` (`author`),
diff --git a/modules/text/text.output.php b/modules/text/text.output.php
index 054ed3d..27a1f5a 100644
--- a/modules/text/text.output.php
+++ b/modules/text/text.output.php
@@ -42,14 +42,14 @@ class text extends module{
}else{
$textid = intval($this->post["textid"]);
}
- $result = $db->query("SELECT a.`id`, a.`rightnavi`, a.`text`, a.`title`, u.`username`, eu.`username` as edituser, a.`date`, a.`edittime`, a.`eid` FROM `" . $config["prefix"] . "article` a LEFT JOIN `".$config["prefix"]."users` eu on a.`eid` = eu.`uid` LEFT JOIN `".$config["prefix"]."users` u on a.`author` = u.`uid` WHERE a.`id`='".$textid."' AND a.`active`='true'") or die($db->error());
+ $result = $db->query("SELECT a.`id` a.`text`, a.`title`, u.`username`, eu.`username` as edituser, a.`date`, a.`edittime`, a.`eid` FROM `" . $config["prefix"] . "article` a LEFT JOIN `".$config["prefix"]."users` eu on a.`eid` = eu.`uid` LEFT JOIN `".$config["prefix"]."users` u on a.`author` = u.`uid` WHERE a.`id`='".$textid."' AND a.`active`='true'") or die($db->error());
}elseif(Isset($this->get["url"]) || Isset($this->post["url"])){
If(Isset($this->get["url"])){
$url=preg_replace( '/\.html($|\?)/i', "$1", $this->get["url"] );
}else{
$url=preg_replace( '/\.html($|\?)/i', "$1", $db->escape_string($this->post["url"]));
}
- $result = $db->query("SELECT a.`id`, a.`rightnavi`, a.`text`, a.`title`, u.`username`, eu.`username` as edituser, a.`date`, a.`edittime`, a.`eid` FROM `" . $config["prefix"] . "article` a LEFT JOIN `".$config["prefix"]."users` eu on a.`eid` = eu.`uid` LEFT JOIN `".$config["prefix"]."users` u on a.`author` = u.`uid` WHERE a.url='".$url."' AND a.`active`='true'");
+ $result = $db->query("SELECT a.`id`, a.`text`, a.`title`, u.`username`, eu.`username` as edituser, a.`date`, a.`edittime`, a.`eid` FROM `" . $config["prefix"] . "article` a LEFT JOIN `".$config["prefix"]."users` eu on a.`eid` = eu.`uid` LEFT JOIN `".$config["prefix"]."users` u on a.`author` = u.`uid` WHERE a.url='".$url."' AND a.`active`='true'");
}else{
@@ -73,7 +73,6 @@ class text extends module{
$editdate = date("d.m.Y, H:i", $row["edittime"]);
$date = date("d.m.Y, H:i", $row["date"]);
- $rightnavi=$row["rightnavi"];
$this->tpl->assign('article', $row);
$this->tpl->assign('cat', $cat);
$this->tpl->assign('editdate', $editdate);
diff --git a/themes/austria/footer.tpl b/themes/austria/footer.tpl
index ffaff7f..c12983e 100644
--- a/themes/austria/footer.tpl
+++ b/themes/austria/footer.tpl
@@ -18,8 +18,9 @@
Navigation
@@ -40,4 +41,4 @@
{$footer}
-->
-