Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv5593
Modified Files:
index.php serendipity_admin.php
serendipity_admin_overview.inc.php
Added Files:
serendipity_entries.php serendipity_entries_overview.inc.php
Log Message:
separate the administration and authoring sections of serendipity.
You can access them via the shortcuts
http://serendipity/entries
http://serendipity/admin
--- NEW FILE: serendipity_entries.php ---
<?php
session_start();
if (file_exists("./serendipity_config_local.inc.php")) {
include("serendipity_config.inc.php");
} else {
$_SESSION['serendipityAuthedUser'] = true;
}
// User logs in?
if($_SESSION['serendipityAuthedUser'] || serendipity_authenticate_author($serendipity["POST"]["user"], $serendipity["POST"]["pass"])) {
$_SESSION["serendipityAuthedUser"] = true;
$serendipity["authorid"] = $_SESSION["serendipityAuthorid"];
}
?>
<html>
<head>
<title>Serendipity Authoring Suite</title>
<link rel="stylesheet" type="text/css" href="<?=$serendipity['serendipityHTTPPath']?>serendipity.css.php">
<?php
if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
?>
</head>
<body>
<div id="serendipity_banner">
<h1><?= $serendipity['blogTitle'] ?></h1>
<?php
$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
if (strlen($sub)) {
?>
<h2><?= $sub ?></h2>
<?php
}
?>
</div>
<?php
// User has to log in
if ($_SESSION["serendipityAuthedUser"] !== true
&& file_exists($serendipity["serendipityPath"]."serendipity_config_local.inc.php")) {
?>
<div class='serendipity_auth_required'>
You have to be logged on to view this page:
<form action="?" method="post">
<input type="hidden" name="serendipity[action]" value="admin">
<input type="text" value="username" name="serendipity[user]" onfocus="value='';">
<input type="password" value="password" name="serendipity[pass]" onfocus="value='';">
<input type="submit" value=">">
</form>
</div>
<?php
} else {
// User is logged in
?>
<table>
<tr valign="top">
<td class="serendipitySideBar">
<div class="serendipitySideBarItem">
<div class="serendipitySideBarTitle">Entries:</div>
<div class="serendipitySideBarContent">
• <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=new'>New entry</a><br>
• <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'>Edit entries</a><br>
• <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect'>Delete entries</a><br>
</div>
</div>
<div class="serendipitySideBarItem">
<div class="serendipitySideBarTitle">Categories:</div>
<div class="serendipitySideBarContent">
• <a href='?serendipity[adminModule]=category&serendipity[adminAction]=editSelect'>Edit Categories</a><br>
</div>
</div>
<div class="serendipitySideBarItem">
<div class="serendipitySideBarTitle">Images:</div>
<div class="serendipitySideBarContent">
• <a href='?serendipity[adminModule]=images&serendipity[adminAction]=addSelect'>Add images</a><br>
• <a href='?serendipity[adminModule]=images'>Manage images</a><br>
• <a href='?serendipity[adminModule]=images&serendipity[adminAction]=genThumbs' onClick="return confirm('WARNING:\nThis may take a long time if there are many images without thumbnails.');">Create Thumbs</a><br>
</div>
</div>
</td>
<td class="serendipity_admin">
<div class="serendipity_admin_title">Serendipity Authoring Suite</div>
<?php
if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
switch($serendipity["GET"]["adminModule"]) {
case "entries":
include("serendipity_admin_entries.inc.php");
break;
case "images":
include("serendipity_admin_images.inc.php");
break;
case "category":
include "serendipity_admin_category.inc.php";
break;
case "logout":
session_destroy();
echo "Logged out.";
break;
default:
include("serendipity_entries_overview.inc.php");
}
?>
</td>
</tr>
</table>
<?php
}
?>
</body>
</html>
--- NEW FILE: serendipity_entries_overview.inc.php ---
<?php
##########################################################################
# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
if (IN_serendipity !== true) die ("Don't hack!");
session_start();
?>
Welcome back, <?= $_SESSION['serendipityUser'] ?>.
Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php 29 Mar 2003 16:13:08 -0000 1.2
+++ index.php 30 Mar 2003 15:50:04 -0000 1.3
@@ -83,6 +83,8 @@
}
} else if (preg_match('@/admin$@', $uri)) {
header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");
+} else if (preg_match('@/entries$@', $uri)) {
+ header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php");
} else if (preg_match('@/(index\.(php|html))?@', $uri)) {
if (count($serendipity['GET']) == 2) {
ob_start();
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin.php 28 Mar 2003 20:05:25 -0000 1.1.1.1
+++ serendipity_admin.php 30 Mar 2003 15:50:05 -0000 1.2
@@ -60,31 +60,6 @@
<td class="serendipitySideBar">
<div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle">Entries:</div>
- <div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=new'>New entry</a><br>
- • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'>Edit entries</a><br>
- • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect'>Delete entries</a><br>
- </div>
- </div>
-
- <div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle">Categories:</div>
- <div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=category&serendipity[adminAction]=editSelect'>Edit Categories</a><br>
- </div>
- </div>
-
- <div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle">Images:</div>
- <div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=images&serendipity[adminAction]=addSelect'>Add images</a><br>
- • <a href='?serendipity[adminModule]=images'>Manage images</a><br>
- • <a href='?serendipity[adminModule]=images&serendipity[adminAction]=genThumbs' onClick="return confirm('WARNING:\nThis may take a long time if there are many images without thumbnails.');">Create Thumbs</a><br>
- </div>
- </div>
-
- <div class="serendipitySideBarItem">
<div class="serendipitySideBarTitle">Appearance:</div>
<div class="serendipitySideBarContent">
• <a href='?serendipity[adminModule]=css'>Manage css</a><br>
@@ -103,7 +78,7 @@
</div>
</td>
<td class="serendipity_admin">
- <div class="serendipity_admin_title">serendipity Administration Suite</div>
+ <div class="serendipity_admin_title">Serendipity Administration Suite</div>
<?php
if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
switch($serendipity["GET"]["adminModule"]) {
@@ -112,10 +87,6 @@
include("./serendipity_admin_installer.inc.php");
break;
- case "entries":
- include("serendipity_admin_entries.inc.php");
- break;
-
case "images":
include("serendipity_admin_images.inc.php");
break;
@@ -123,10 +94,6 @@
case "css":
include("serendipity_admin_css.inc.php");
break;
-
- case "category":
- include "serendipity_admin_category.inc.php";
- break;
case "plugins":
include "serendipity_admin_plugins.inc.php";
Index: serendipity_admin_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_overview.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_overview.inc.php 28 Mar 2003 20:05:25 -0000 1.1.1.1
+++ serendipity_admin_overview.inc.php 30 Mar 2003 15:50:05 -0000 1.2
@@ -12,4 +12,4 @@
if (IN_serendipity !== true) die ("Don't hack!");
session_start();
?>
-Welcome back, <?= $_SESSION['serendipityUser'] ?>. Would you like to play a game?
+Welcome back, <?= $_SESSION['serendipityUser'] ?>.
|