Update to latest version
This commit is contained in:
parent
8a89842ec6
commit
fe9ecfad73
77 changed files with 1701 additions and 5404 deletions
|
@ -22,7 +22,7 @@
|
|||
* @author Bernhard Jaud <bernhard at becast dot at>
|
||||
* @package astat core
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
* @version $Id$
|
||||
* @version $Id: b9eeb0fd7ab78feed4582e33dd2604a26281a58f $
|
||||
*/
|
||||
If (!defined("IN_BCWE_ADMIN")) {
|
||||
die("Dieses Script kann nicht ausserhalb des Frameworks laufen!");
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
* @author Bernhard Jaud <bernhard at becast dot at>
|
||||
* @package astat core
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
* @version $Id$
|
||||
* @version $Id: ca7c3b985bdb214ce7622dc7397419774c03bace $
|
||||
*/
|
||||
|
||||
If (!defined("IN_BCWE_ADMIN")) {
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
* @author Bernhard Jaud <bernhard at becast dot at>
|
||||
* @package astat core
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
* @version $Id$
|
||||
* @version $Id: 3ab99ecb3291e81fff1273ceb58bd035ae66feb6 $
|
||||
*/
|
||||
If (!defined("IN_BCWE_ADMIN")) {
|
||||
die("Dieses Script kann nicht ausserhalb des Frameworks laufen!");
|
||||
|
@ -85,7 +85,7 @@ class edit_text_panel extends admin_module{
|
|||
$panel->select($karray,$_POST["menue"],"menue");
|
||||
$panel->content.="<br />";
|
||||
$panel->content.="<h3>Kategorien:</h3>
|
||||
<table width=\"100%\">
|
||||
<table style='width: 100%'>
|
||||
<tr>";
|
||||
$resultn = $db->query("SELECT `c_id` FROM `" . $config["prefix"] . "article_category` WHERE `a_id`='".intval($_GET['id'])."'");
|
||||
while($rowa=$db->fetch_array($resultn)){
|
||||
|
@ -125,15 +125,15 @@ class edit_text_panel extends admin_module{
|
|||
$panel->formClose();
|
||||
}elseif($_GET["action"]=="delete" && $_GET["id"]){
|
||||
$db->query("DELETE FROM `" . $config["prefix"] . "article` WHERE `id`='".intval($_GET["id"])."'");
|
||||
$db->query("DELETE FROM `" . $config["prefix"] . "article_menue` where `a_id`='".$id."'");
|
||||
$db->query("DELETE FROM `" . $config["prefix"] . "article_menue` where `a_id`='".intval($_GET["id"])."'");
|
||||
$panel->admin_message("Artikel gelöscht!","Der Artikel wurde erfolgreich gelöscht.",True,"edit_text",3);
|
||||
}
|
||||
|
||||
}else{
|
||||
$result = $db->query("SELECT a.title,a.id,a.active,a.date,a.url,u.username FROM `" . $config["prefix"] . "article` a LEFT JOIN `" . $config["prefix"] . "users` u on a.`author`=u.`uid`");
|
||||
while($row=$db->fetch_array($result, $db->ASSOC)){
|
||||
while($row=$db->fetch_array($result)){
|
||||
$cresult=$db->query("SELECT a.`categoryname` FROM `" . $config["prefix"] . "article_categories` a LEFT JOIN `" . $config["prefix"] . "article_category` c on a.`id`=c.`c_id` WHERE c.`a_id`='".$row["id"]."'");
|
||||
while($crow=$db->fetch_array($cresult, $db->ASSOC)){
|
||||
while($crow=$db->fetch_array($cresult)){
|
||||
if(!$row["categoryname"]){
|
||||
$row["categoryname"]=$crow["categoryname"];
|
||||
}else{
|
||||
|
@ -144,15 +144,15 @@ class edit_text_panel extends admin_module{
|
|||
$articles[]=$row;
|
||||
}
|
||||
$panel->title="Vorhandene Artikel";
|
||||
$panel->content.="<table class=\"sortable\" width=\"90%\" cellspacing=\"2\">
|
||||
$panel->content.="<table class=\"sortable\" style=\"width: 90%; border-spacing: 2px;\">
|
||||
<tr>
|
||||
<th align=\"center\">ID</th>
|
||||
<th align=\"center\">Name</th>
|
||||
<th align=\"center\">URL</th>
|
||||
<th align=\"center\">Kategorien</th>
|
||||
<th align=\"center\">Aktiv</th>
|
||||
<th align=\"center\">User</th>
|
||||
<th class=\"nosort sortcol\" align=\"center\" width=\"18%\">Aktionen</th>
|
||||
<th style=\"text-align: center;\">ID</th>
|
||||
<th style=\"text-align: center;\">Name</th>
|
||||
<th style=\"text-align: center;\">URL</th>
|
||||
<th style=\"text-align: center;\">Kategorien</th>
|
||||
<th style=\"text-align: center;\">Aktiv</th>
|
||||
<th style=\"text-align: center;\">User</th>
|
||||
<th class=\"nosort sortcol\" style=\"text-align: center; width: 18%\">Aktionen</th>
|
||||
</tr>";
|
||||
if(!empty($articles)){
|
||||
foreach($articles as $u){
|
||||
|
@ -162,18 +162,18 @@ class edit_text_panel extends admin_module{
|
|||
$u["a"]="Nein";
|
||||
}
|
||||
$panel->content.="<tr>
|
||||
<td align=\"center\">".$u["id"]."</td>
|
||||
<td align=\"center\">".$u["title"]."</td>
|
||||
<td align=\"center\">".$u["url"]."</td>
|
||||
<td align=\"center\">".$u["categoryname"]."</td>
|
||||
<td align=\"center\">".$u["a"]."</td>
|
||||
<td align=\"center\">".$u["username"]."</td>";
|
||||
$panel->content.="<td align=\"center\"><a onclick=\"return confirmLink(this, 'Willst du wirklich den Artikel ".$u["title"]." löschen? ')\" href=\"".$config["path"]."/admin/index.php?panel=edit_text&action=delete&id=".$u["id"]."\"><img src=\"".$config["path"]."/admin/images/icons/delete.png\" /></a> <a href=\"".$config["path"]."/admin/index.php?panel=edit_text&action=edit&id=".$u["id"]."\"><img src=\"".$config["path"]."/admin/images/icons/wrench.png\" /></a></td>
|
||||
<td style=\"text-align: center;\">".$u["id"]."</td>
|
||||
<td style=\"text-align: center;\">".$u["title"]."</td>
|
||||
<td style=\"text-align: center;\">".$u["url"]."</td>
|
||||
<td style=\"text-align: center;\">".$u["categoryname"]."</td>
|
||||
<td style=\"text-align: center;\">".$u["a"]."</td>
|
||||
<td style=\"text-align: center;\">".$u["username"]."</td>";
|
||||
$panel->content.="<td style=\"text-align: center;\"><a onclick=\"return confirmLink(this, 'Willst du wirklich den Artikel ".$u["title"]." löschen? ')\" href=\"".$config["path"]."/admin/index.php?panel=edit_text&action=delete&id=".$u["id"]."\"><img src=\"".$config["path"]."/admin/images/icons/delete.png\" /></a> <a href=\"".$config["path"]."/admin/index.php?panel=edit_text&action=edit&id=".$u["id"]."\"><img src=\"".$config["path"]."/admin/images/icons/wrench.png\" /></a></td>
|
||||
</tr>";
|
||||
}
|
||||
}else{
|
||||
$panel->content.="<tr>
|
||||
<td align=\"center\" colspan=\"7\">Keine Artikel vorhanden.</td>
|
||||
<td style=\"text-align: center;\" colspan=\"7\">Keine Artikel vorhanden.</td>
|
||||
</tr>";
|
||||
}
|
||||
$panel->content.="</table><br />";
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
* @author Bernhard Jaud <bernhard at becast dot at>
|
||||
* @package BeCast WebEngine core
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
* @version $Id$
|
||||
* @version $Id: 0a547989ebfde4dba7c560bb10b1e925117c26a9 $
|
||||
*/
|
||||
|
||||
If (!defined("IN_BCWE_ADMIN")) {
|
||||
|
@ -125,31 +125,31 @@ class editcategory_text_panel extends admin_module{
|
|||
$articles[]=$row;
|
||||
}
|
||||
$panel->title="Vorhandene Kategorien";
|
||||
$panel->content.="<table class=\"sortable\" width=\"90%\" cellspacing=\"2\">
|
||||
$panel->content.="<table class=\"sortable\" style=\"width: 90%; border-spacing: 2px;\">
|
||||
<tr>
|
||||
<th align=\"center\">ID</th>
|
||||
<th align=\"center\">Name</th>
|
||||
<th align=\"center\">Bild</th>
|
||||
<th align=\"center\">Aktiv</th>
|
||||
<th class=\"nosort sortcol\" align=\"center\" width=\"18%\">Aktionen</th>
|
||||
<th style=\"text-align: center;\">ID</th>
|
||||
<th style=\"text-align: center;\">Name</th>
|
||||
<th style=\"text-align: center;\">Bild</th>
|
||||
<th style=\"text-align: center;\">Aktiv</th>
|
||||
<th class=\"nosort sortcol\" style=\"text-align: center; width: 18%\">Aktionen</th>
|
||||
</tr>";
|
||||
if(!empty($articles)){
|
||||
foreach($articles as $u){
|
||||
$panel->content.="<tr>
|
||||
<td align=\"center\">".$u["id"]."</td>
|
||||
<td align=\"center\">".$u["categoryname"]."</td>
|
||||
<td align=\"center\">".$u["picture"]."</td>";
|
||||
<td style=\"text-align: center;\">".$u["id"]."</td>
|
||||
<td style=\"text-align: center;\">".$u["categoryname"]."</td>
|
||||
<td style=\"text-align: center;\">".$u["picture"]."</td>";
|
||||
if($u["active"]=="true"){
|
||||
$panel->content.="<td align=\"center\">Ja</td>";
|
||||
$panel->content.="<td style=\"text-align: center;\">Ja</td>";
|
||||
}else{
|
||||
$panel->content.="<td align=\"center\">Nein</td>";
|
||||
$panel->content.="<td style=\"text-align: center;\">Nein</td>";
|
||||
}
|
||||
$panel->content.="<td align=\"center\"><a onclick=\"return confirmLink(this, 'Willst du wirklich die Kategorie ".$u["categoryname"]." löschen? ')\" href=\"".$config["path"]."/admin/index.php?panel=editcategory_text&action=delete&id=".$u["id"]."\"><img src=\"".$config["path"]."/admin/images/icons/delete.png\" /></a> <a href=\"".$config["path"]."/admin/index.php?panel=editcategory_text&action=edit&id=".$u["id"]."\"><img src=\"".$config["path"]."/admin/images/icons/wrench.png\" /></a></td>
|
||||
$panel->content.="<td style=\"text-align: center;\"><a onclick=\"return confirmLink(this, 'Willst du wirklich die Kategorie ".$u["categoryname"]." löschen? ')\" href=\"".$config["path"]."/admin/index.php?panel=editcategory_text&action=delete&id=".$u["id"]."\"><img src=\"".$config["path"]."/admin/images/icons/delete.png\" /></a> <a href=\"".$config["path"]."/admin/index.php?panel=editcategory_text&action=edit&id=".$u["id"]."\"><img src=\"".$config["path"]."/admin/images/icons/wrench.png\" /></a></td>
|
||||
</tr>";
|
||||
}
|
||||
}else{
|
||||
$panel->content.="<tr>
|
||||
<td align=\"center\" colspan=\"5\">Keine Kategorien vorhanden.</td>
|
||||
<td style=\"text-align: center;\" colspan=\"5\">Keine Kategorien vorhanden.</td>
|
||||
</tr>";
|
||||
}
|
||||
$panel->content.="</table><br />";
|
||||
|
@ -157,7 +157,8 @@ class editcategory_text_panel extends admin_module{
|
|||
}
|
||||
|
||||
function meta(){
|
||||
$meta.='<script type="text/javascript" src="'.$config["path"].'/js/scriptaculous/prototype.js"></script>
|
||||
global $config;
|
||||
$meta ='<script type="text/javascript" src="'.$config["path"].'/js/scriptaculous/prototype.js"></script>
|
||||
<script src="'.$config["path"].'/js/fastinit.js" type="text/javascript">
|
||||
</script>
|
||||
<script src="'.$config["path"].'/js/tablesort.js" type="text/javascript">
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
global $session;
|
||||
If (!defined("INBCWE")) {
|
||||
die("Dieses Script kann nicht ausserhalb des Frameworks laufen!");
|
||||
}
|
||||
|
@ -15,7 +16,7 @@ class text extends ajax_module{
|
|||
if(isset($_POST['url'])&& $_POST['url']!=""){
|
||||
$url=$db->escape($_POST['url']);
|
||||
$result = $db->query("SELECT count(`id`) as `count` FROM `" . $config["prefix"] . "article` WHERE `url`='".$url."'");
|
||||
$row = $db->fetch_array($result, MYSQL_ASSOC);
|
||||
$row = $db->fetch_array($result);
|
||||
if($row["count"]==0){
|
||||
echo 0;
|
||||
}else{
|
||||
|
@ -25,5 +26,4 @@ class text extends ajax_module{
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
<?php
|
||||
<?php global $session;
|
||||
/**
|
||||
* Project: BeCast WebEngine - simple site engine
|
||||
* File: /modules/text/text.output.php
|
||||
|
@ -21,7 +21,7 @@
|
|||
* @author Bernhard Jaud <bernhard at becast dot at>
|
||||
* @package BcWe core
|
||||
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
* @version $Id$
|
||||
* @version $Id: e0a301bfd94c80b882fbaf8db054bff98be63ca5 $
|
||||
*/
|
||||
|
||||
If (!defined("INBCWE")) {
|
||||
|
@ -32,60 +32,59 @@ $session->page_begin("Text Module", FALSE);
|
|||
|
||||
class text extends module{
|
||||
|
||||
function output(){
|
||||
global $module,$config,$db,$log,$core,$error;
|
||||
$textid=0;
|
||||
$url="";
|
||||
if(Isset($this->get["textid"]) || Isset($this->post["textid"])){
|
||||
if(Isset($this->get["textid"])){
|
||||
$textid = intval($this->get["textid"]);
|
||||
}else{
|
||||
$textid = intval($this->post["textid"]);
|
||||
function output()
|
||||
{
|
||||
global $module, $config, $db, $log, $core, $error;
|
||||
$textid = 0;
|
||||
$url = "";
|
||||
if (isset($this->get["textid"]) || isset($this->post["textid"])) {
|
||||
if (isset($this->get["textid"])) {
|
||||
$textid = intval($this->get["textid"]);
|
||||
} else {
|
||||
$textid = intval($this->post["textid"]);
|
||||
}
|
||||
$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.`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.`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.`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 {
|
||||
return $error->http_error("404");
|
||||
|
||||
}
|
||||
$fid="";
|
||||
$fid.=$textid;
|
||||
$fid.=$url;
|
||||
if($db->num_rows($result) > 0){
|
||||
if(!$this->tpl->isCached('textview.tpl',"textview".$fid)) {
|
||||
$row = $db->fetch_array($result);
|
||||
$cresult = $db->query("SELECT * FROM `" . $config["prefix"] . "article_categorys` c LEFT JOIN `" . $config["prefix"] . "article_category` s ON c.`id`=s.`c_id` WHERE s.`a_id`='".$row["id"]."'");
|
||||
while($c=$db->fetch_array($cresult)){
|
||||
if(!$cat){
|
||||
$cat=$c["categoryname"];
|
||||
}else{
|
||||
$cat.=", ".$c["categoryname"];
|
||||
}
|
||||
$fid = "";
|
||||
$fid .= $textid;
|
||||
$fid .= $url;
|
||||
if ($db->num_rows($result) > 0) {
|
||||
if (!$this->tpl->isCached('textview.tpl', "textview" . $fid)) {
|
||||
$row = $db->fetch_array($result);
|
||||
$cresult = $db->query("SELECT * FROM `" . $config["prefix"] . "article_categories` c LEFT JOIN `" . $config["prefix"] . "article_category` s ON c.`id`=s.`c_id` WHERE s.`a_id`='" . $row["id"] . "'");
|
||||
while ($c = $db->fetch_array($cresult)) {
|
||||
if (!$cat) {
|
||||
$cat = $c["categoryname"];
|
||||
} else {
|
||||
$cat .= ", " . $c["categoryname"];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$editdate = date("d.m.Y, H:i", $row["edittime"]);
|
||||
$date = date("d.m.Y, H:i", $row["date"]);
|
||||
$this->tpl->assign('article', $row);
|
||||
$this->tpl->assign('cat', $cat);
|
||||
$this->tpl->assign('editdate', $editdate);
|
||||
$this->tpl->assign('date', $date);
|
||||
}
|
||||
$this->titleaddon=$row['title'].' - ';
|
||||
$core->add_navbit($row['title']);
|
||||
return $this->tpl->fetch('textview.tpl',"textview".$fid);
|
||||
}else{
|
||||
}
|
||||
$this->titleaddon = $row['title'] . ' - ';
|
||||
$core->add_navbit($row['title']);
|
||||
return $this->tpl->fetch('textview.tpl', "textview" . $fid);
|
||||
} else {
|
||||
return $error->http_error("404");
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue