|
From: <tom...@us...> - 2003-08-10 17:56:13
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv12276
Modified Files:
serendipity_admin.php serendipity_entries.php
serendipity_functions.inc.php
Log Message:
New way of logging in.
This will provide a better overview (and unified function) of the login procedures.
It also fixes a number of problems with correct HTML during login and installation
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_admin.php 5 Aug 2003 14:07:40 -0000 1.17
+++ serendipity_admin.php 10 Aug 2003 17:56:10 -0000 1.18
@@ -10,14 +10,6 @@
include_once 'serendipity_lang.inc.php';
$_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>
@@ -44,34 +36,20 @@
}
?>
</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'>
- <?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>
+ <table id="mainpane">
+ <tr id="content" valign="top">
<?php
-} elseif (!file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
+if ( !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'); ?>
+ <td class="serendipity_admin">
+ <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div>
+ <p><?php include('serendipity_admin_installer.inc.php'); ?>
<?php
+} elseif ( !serendipity_userLoggedIn() ) {
+ serendipity_printLogin();
} 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>
@@ -133,13 +111,11 @@
default:
include 'serendipity_admin_overview.inc.php';
}
+}
?>
</td>
</tr>
</table>
-<?php
-}
-?>
</body>
</html>
Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_entries.php 16 Jul 2003 11:59:28 -0000 1.14
+++ serendipity_entries.php 10 Aug 2003 17:56:10 -0000 1.15
@@ -7,12 +7,6 @@
$_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>
@@ -45,23 +39,9 @@
<table id="mainpane">
<tr id="content" valign="top">
<?php
-// User has to log in
-if ($_SESSION['serendipityAuthedUser'] !== true
- && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
-?>
- <td class="serendipity_admin">
- <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" name="serendipity[user]" value="username" onfocus="value='';" />
- <input type="password" name="serendipity[pass]" value="password" onfocus="value='';" />
- <input type="submit" name="submit" value=">">
- </form>
- </div>
-<?php
+if ( !serendipity_userLoggedIn() ) {
+ serendipity_printLogin();
} else {
- // User is logged in
?>
<td class="serendipitySideBar">
<div class="serendipitySideBarItem">
@@ -126,13 +106,11 @@
default:
include 'serendipity_entries_overview.inc.php';
}
+ }
?>
</td>
</tr>
</table>
-<?php
-}
-?>
</body>
</html>
<?php
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- serendipity_functions.inc.php 10 Aug 2003 16:56:25 -0000 1.122
+++ serendipity_functions.inc.php 10 Aug 2003 17:56:10 -0000 1.123
@@ -5,6 +5,37 @@
include_once('./serendipity_functions_config.inc.php');
$serendipity['imageList'] = array();
+function serendipity_userLoggedIn() {
+ global $serendipity;
+ if ( serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass']) ) {
+ $_SESSION['serendipityAuthedUser'] = true;
+ $serendipity['authorid'] = $_SESSION['serendipityAuthorid'];
+ return true;
+ }
+
+ if ( $_SESSION['serendipityAuthedUser'] === true && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php') ) {
+ return true;
+ } else {
+ return false;
+ }
+
+}
+
+function serendipity_printLogin() {
+?>
+ <td class="serendipity_admin">
+ <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" 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
+}
+
function serendipity_getTemplateFile($file) {
global $serendipity;
if ( file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['CONFIG']['template'] . '/'. $file) ) {
@@ -1752,11 +1783,11 @@
function serendipity_authenticate_author($username, $password) {
global $serendipity;
- if($_SESSION['serendipityAuthedUser'] == true) {
+ if( $_SESSION['serendipityAuthedUser'] == true ) {
$serendipity['serendipityUser'] = $_SESSION['serendipityUser'];
$serendipity['serendipityEmail'] = $_SESSION['serendipityEmail'];
$serendipity['authorid'] = $_SESSION['serendipityAuthorid'];
- return 1;
+ return true;
}
$password = md5($password);
@@ -1778,10 +1809,10 @@
$_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $username;
$_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email'];
$_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid'];
- return 1;
+ return true;
}
- return 0;
+ return false;
}
function serendipity_track_referrer($entry = 0) {
|
