|
From: <gar...@us...> - 2003-07-16 11:58:29
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv15123
Modified Files:
serendipity_lang_de.inc.php serendipity_lang_en.inc.php
serendipity_admin.php
Log Message:
More code style, language separation.
Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_de.inc.php 8 Jul 2003 14:40:00 -0000 1.15
+++ serendipity_lang_de.inc.php 16 Jul 2003 11:58:24 -0000 1.16
@@ -173,6 +173,14 @@
define('ENTRIES_FOR', 'Einträge am %s');
define('TOPICS_FOR', 'Themen am %s');
define('DOCUMENT_NOT_FOUND', 'Das Dokument %s wurde nicht gefunden.');
+define('USERNAME', 'Benutzername');
+define('PASSWORD', 'Passwort');
+define('SERENDIPITY_INSTALLATION', 'Serendipity-Installation');
+define('LEFT', 'links');
+define('RIGHT', 'rechts');
+define('HIDDEN', 'versteckt');
+define('REMOVE_TICKED_PLUGINS', 'Markierte plugins entfernen');
+define('SAVE_CHANGES_TO_LAYOUT', 'Änderungen am Layout speichern');
define('serendipity_LANG_LOADED', true);
/* vim: set sts=4 ts=4 expandtab : */
Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_en.inc.php 8 Jul 2003 14:40:00 -0000 1.19
+++ serendipity_lang_en.inc.php 16 Jul 2003 11:58:24 -0000 1.20
@@ -173,6 +173,14 @@
define('ENTRIES_FOR', 'Entries for %s');
define('TOPICS_FOR', 'Topics for %s');
define('DOCUMENT_NOT_FOUND', 'The document %s was not found.');
+define('USERNAME', 'username');
+define('PASSWORD', 'password');
+define('SERENDIPITY_INSTALLATION', 'Serendipity installation');
+define('LEFT', 'left');
+define('RIGHT', 'right');
+define('HIDDEN', 'hidden');
+define('REMOVE_TICKED_PLUGINS', 'Remove ticked plugins');
+define('SAVE_CHANGES_TO_LAYOUT', 'Save changes to layout');
define('serendipity_LANG_LOADED', true);
/* vim: set sts=4 ts=4 expandtab : */
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_admin.php 8 Jul 2003 09:13:27 -0000 1.15
+++ serendipity_admin.php 16 Jul 2003 11:58:24 -0000 1.16
@@ -1,130 +1,144 @@
<?php # $Id$
-ini_set("session.use_trans_sid",1);
+ini_set('session.use_trans_sid', 1);
session_start();
-if (file_exists("./serendipity_config_local.inc.php")) {
- include("serendipity_config.inc.php");
+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"];
+if($_SESSION['serendipityAuthedUser']
+ || serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
+
+ $_SESSION['serendipityAuthedUser'] = true;
+ $serendipity['authorid'] = $_SESSION['serendipityAuthorid'];
}
?>
<html>
- <head>
- <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
- <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
+ <head>
+ <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
+ <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
<?php
- if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
+if (strtolower($serendipity['extCSS'])!='none') {
+?>
+ <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['extCSS']; ?>" />
+<?php
+}
?>
-
</head>
- <body>
-<div id="serendipity_banner">
- <h1><?php echo $serendipity['blogTitle'] ; ?></h1>
+
+<body>
+ <div id="serendipity_banner">
+ <h1><?php echo $serendipity['blogTitle'] ; ?></h1>
<?php
- $sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
- if (strlen($sub)) {
+$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
+if (strlen($sub)) {
?>
- <h2><?php echo $sub ; ?></h2>
+ <h2><?php echo $sub ; ?></h2>
<?php
- }
+}
?>
-</div>
+ </div>
+
<?php
- // User has to log in
- if ($_SESSION["serendipityAuthedUser"] !== true
- && file_exists($serendipity["serendipityPath"]."serendipity_config_local.inc.php")) {
+// User has to log in
+if ($_SESSION['serendipityAuthedUser'] !== true
+ && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
?>
- <div class='serendipity_auth_required'>
- <?php echo HAVE_TO_BE_LOGGED_ON; ?>
- <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>
+ <div class='serendipity_auth_required'>
+ <?php echo HAVE_TO_BE_LOGGED_ON; ?>
+ <form action="?" method="post">
+ <div>
+ <input type="hidden" name="serendipity[action]" value="admin" />
+ <input type="text" name="serendipity[user]" value="<?php echo USERNAME; ?>" onfocus="value='';" />
+ <input type="password" name="serendipity[pass]" value="<?php echo PASSWORD ?>" onfocus="value='';" />
+ <input type="submit" name="submit" value=">" />
+ </form>
+ </div>
<?php
- } elseif (!file_exists($serendipity["serendipityPath"]."serendipity_config_local.inc.php")) {
- // User just installed serendipity, let him go to configure mode
- echo "<div class='serendipity_date'>Serendipity Installation</div><p>";
- include("./serendipity_admin_installer.inc.php");
- } else {
- // User is logged in
+} elseif (!file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
+ // User just installed serendipity, let him go to configure mode
?>
+ <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div>
+ <p><?php include('serendipity_admin_installer.inc.php'); ?>
+<?php
+} else {
+ // User is logged in
+?>
+ <table id="mainpane">
+ <tr id="content" valign="top">
+ <td class="serendipitySideBar">
+ <div class="serendipitySideBarItem">
+ <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?>:</div>
+ <div class="serendipitySideBarContent">
+ • <a href="?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a><br />
+ • <a href="?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a><br />
+ </div>
+ </div>
- <table id="mainpane">
- <tr id="content" valign="top">
- <td class="serendipitySideBar">
-
- <div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?>:</div>
- <div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=templates'><?php echo MANAGE_STYLES; ?></a><br>
- • <a href='?serendipity[adminModule]=plugins'><?php echo CONFIGURE_PLUGINS; ?></a><br>
- </div>
- </div>
-
- <div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div>
- <div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=installer'><?php echo CONFIGURATION; ?></a><br />
- • <a href="?serendipity[adminModule]=interop"><?php echo IMPORT_EXPORT_ENTRIES; ?></a><br />
- </div>
- </div>
- • <a href='<?php echo $serendipity['serendipityHTTPPath']; ?>entries'><?php echo AUTHOR_SUITE; ?></a><br />
- • <a href='<?php echo $serendipity['serendipityHTTPPath'] ; ?>'><?php echo BACK_TO_BLOG; ?></a><br />
- • <a href='?serendipity[adminModule]=logout'><?php echo LOGOUT; ?></a><br />
- <img src="<?php echo $serendipity[baseURL]."templates/default/img/leer.png"?>" height="1" width="130" />
- </td>
- <td class="serendipity_admin">
- <div class="serendipity_admin_title"><?php echo SERENDIPITY_ADMIN_SUITE; ?></div>
- <?php
- if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
- switch($serendipity["GET"]["adminModule"]) {
+ <div class="serendipitySideBarItem">
+ <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div>
+ <div class="serendipitySideBarContent">
+ • <a href="?serendipity[adminModule]=installer"><?php echo CONFIGURATION; ?></a><br />
+ • <a href="?serendipity[adminModule]=interop"><?php echo IMPORT_EXPORT_ENTRIES; ?></a><br />
+ </div>
+ </div>
- case "installer":
- include("./serendipity_admin_installer.inc.php");
- break;
+ <div class="serendipitySideBarContent">
+ • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>entries"><?php echo AUTHOR_SUITE; ?></a><br />
+ • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG; ?></a><br />
+ • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br />
+ <img src="<?php echo $serendipity['baseURL']; ?>templates/default/img/leer.png" height="1" width="130" alt="" />
+ </div>
+ </td>
- case "images":
- include("serendipity_admin_images.inc.php");
- break;
+ <td class="serendipity_admin">
+ <div class="serendipity_admin_title"><?php echo SERENDIPITY_ADMIN_SUITE; ?></div>
+<?php
+ if (!$serendipity['GET']['adminModule']) {
+ $serendipity['GET']['adminModule'] = $serendipity['POST']['adminModule'];
+ }
+
+ switch($serendipity['GET']['adminModule']) {
+ case 'installer':
+ include './serendipity_admin_installer.inc.php';
+ break;
- case "templates":
- include("serendipity_admin_templates.inc.php");
- break;
+ case 'images':
+ include 'serendipity_admin_images.inc.php';
+ break;
- case "plugins":
- include "serendipity_admin_plugins.inc.php";
- break;
+ case 'templates':
+ include 'serendipity_admin_templates.inc.php';
+ break;
- case "interop":
- include "serendipity_admin_interop.inc.php";
- break;
+ case 'plugins':
+ include 'serendipity_admin_plugins.inc.php';
+ break;
- case "logout":
- session_destroy();
- echo LOGGEDOUT;
- break;
+ case 'interop':
+ include 'serendipity_admin_interop.inc.php';
+ break;
- default:
- include("serendipity_admin_overview.inc.php");
+ case 'logout':
+ session_destroy();
+ echo LOGGEDOUT;
+ break;
- }
- ?>
- </td>
- </tr>
- </table>
- <?php
- }
- ?>
+ default:
+ include 'serendipity_admin_overview.inc.php';
+ }
+?>
+ </td>
+ </tr>
+ </table>
+<?php
+}
+?>
- </body>
+</body>
</html>
<?php
/* vim: set sts=4 ts=4 expandtab : */
|
