Legalese update and bugfixes
This commit is contained in:
parent
d032d1e427
commit
fe90a14a57
6 changed files with 11 additions and 12 deletions
|
@ -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 canon_chars.html index.php?task=rp&sub=canons [QSA,L]
|
||||||
RewriteRule logs.html index.php?task=chat&sub=logs [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 private.html index.php?task=chat&sub=privatelogs [QSA,L]
|
||||||
RewriteRule ^text/guidelines.html$ /text/rules.html [R=301,L]
|
RewriteRule ^guidelines.html$ /text/rules.html [R=301,L]
|
||||||
RewriteRule ^text/(.*\.html?)$ index.php?task=text&url=$1 [L]
|
RewriteRule ^(.*\.html?)$ index.php?task=text&url=$1 [L]
|
||||||
RewriteRule profile/(.*) index.php?task=rp&sub=show&name=$1
|
RewriteRule profile/(.*) index.php?task=rp&sub=show&name=$1
|
||||||
|
|
||||||
RewriteCond %{HTTP_HOST} ^chat\.coppertopia\.net$
|
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]
|
RewriteRule ^user/(.*)$ ?task=chat&sub=privatelogs&user=$1 [QSA,L]
|
||||||
RewriteCond %{HTTP_HOST} ^logs\.coppertopia\.net$
|
RewriteCond %{HTTP_HOST} ^logs\.coppertopia\.net$
|
||||||
RewriteRule ^$ ?task=chat&sub=logs [QSA,L]
|
RewriteRule ^$ ?task=chat&sub=logs [QSA,L]
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
|
@ -45,7 +45,7 @@ class edit_text_panel extends admin_module{
|
||||||
$row = $db->fetch_array($result);
|
$row = $db->fetch_array($result);
|
||||||
|
|
||||||
if($row["count"]==0){
|
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."'");
|
$db->query("DELETE FROM `" . $config["prefix"] . "article_category` where `a_id`='".$id."'");
|
||||||
if($_POST["cats"]!=""){
|
if($_POST["cats"]!=""){
|
||||||
foreach($_POST["cats"] as $nid){
|
foreach($_POST["cats"] as $nid){
|
||||||
|
|
|
@ -28,7 +28,6 @@ class module_text extends admin_module{
|
||||||
`menue` int(11) NOT NULL default '0',
|
`menue` int(11) NOT NULL default '0',
|
||||||
`title` varchar(80) NOT NULL default '',
|
`title` varchar(80) NOT NULL default '',
|
||||||
`url` varchar(120) NOT NULL,
|
`url` varchar(120) NOT NULL,
|
||||||
`rightnavi` enum('false','true') NOT NULL,
|
|
||||||
`active` enum('true','false') NOT NULL,
|
`active` enum('true','false') NOT NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `author` (`author`),
|
KEY `author` (`author`),
|
||||||
|
|
|
@ -42,14 +42,14 @@ class text extends module{
|
||||||
}else{
|
}else{
|
||||||
$textid = intval($this->post["textid"]);
|
$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"])){
|
}elseif(Isset($this->get["url"]) || Isset($this->post["url"])){
|
||||||
If(Isset($this->get["url"])){
|
If(Isset($this->get["url"])){
|
||||||
$url=preg_replace( '/\.html($|\?)/i', "$1", $this->get["url"] );
|
$url=preg_replace( '/\.html($|\?)/i', "$1", $this->get["url"] );
|
||||||
}else{
|
}else{
|
||||||
$url=preg_replace( '/\.html($|\?)/i', "$1", $db->escape_string($this->post["url"]));
|
$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{
|
}else{
|
||||||
|
@ -73,7 +73,6 @@ class text extends module{
|
||||||
|
|
||||||
$editdate = date("d.m.Y, H:i", $row["edittime"]);
|
$editdate = date("d.m.Y, H:i", $row["edittime"]);
|
||||||
$date = date("d.m.Y, H:i", $row["date"]);
|
$date = date("d.m.Y, H:i", $row["date"]);
|
||||||
$rightnavi=$row["rightnavi"];
|
|
||||||
$this->tpl->assign('article', $row);
|
$this->tpl->assign('article', $row);
|
||||||
$this->tpl->assign('cat', $cat);
|
$this->tpl->assign('cat', $cat);
|
||||||
$this->tpl->assign('editdate', $editdate);
|
$this->tpl->assign('editdate', $editdate);
|
||||||
|
|
|
@ -18,8 +18,9 @@
|
||||||
<h3 class="social">Navigation</h3>
|
<h3 class="social">Navigation</h3>
|
||||||
|
|
||||||
<ul class="navigate group">
|
<ul class="navigate group">
|
||||||
<li><a href="/index.php">Home</a></li>
|
<li><a href="/">Home</a></li>
|
||||||
<li><a href="/impressum.html">Impressum</a></li>
|
<li><a href="/nutzungsbedingungen.html">Nutzungsbedingungen</a></li>
|
||||||
|
<li><a href="/datenschutzerklaerung.html">Datenschutzerklärung</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -40,4 +41,4 @@
|
||||||
{$footer}
|
{$footer}
|
||||||
-->
|
-->
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row add-bottom">
|
<div class="row add-bottom">
|
||||||
<div class="twelve columns">
|
<div class="twelve columns">
|
||||||
<input type="checkbox" value="1" name="agreed" id="agreed" /><strong> Ich stimme den <a href="/text/nutzungsbedingungen.html">Nutzungsbedingungen</a> zu und bestätige mindestens 16 Jahre alt zu sein.</strong><img src="themes/default/images/icons/bullet_star.png" style="border:none;"/>
|
<input type="checkbox" value="1" name="agreed" id="agreed" /><strong> Ich stimme den <a href="/nutzungsbedingungen.html">Nutzungsbedingungen</a> und der <a href="/datenschutzerklaerung.html">Datenschutzerkl&aulm;rung</a> zu und bestätige mindestens 16 Jahre alt zu sein.</strong><img src="themes/default/images/icons/bullet_star.png" style="border:none;"/>
|
||||||
{if $captcha != ""}
|
{if $captcha != ""}
|
||||||
<legend>Captcha<img src="themes/default/images/icons/bullet_star.png" style="border:none;"/></legend>
|
<legend>Captcha<img src="themes/default/images/icons/bullet_star.png" style="border:none;"/></legend>
|
||||||
{$captcha}
|
{$captcha}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue