[geeklog-cvs] geeklog: Removed misplaced global declaration (and started using...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Jan 5 05:07:02 EST 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c12f857524eb
changeset: 6624:c12f857524eb
user: Dirk Haun <dirk at haun-online.de>
date: Thu Jan 01 13:50:40 2009 +0100
description:
Removed misplaced global declaration (and started using 2009 as the copyright year)
diffstat:
4 files changed, 11 insertions(+), 24 deletions(-)
public_html/admin/user.php | 13 +++++--------
public_html/lib-common.php | 7 ++-----
public_html/users.php | 7 ++-----
system/lib-user.php | 8 ++------
diffs (162 lines):
diff -r d9f30084e9c5 -r c12f857524eb public_html/admin/user.php
--- a/public_html/admin/user.php Thu Jan 01 13:37:41 2009 +0100
+++ b/public_html/admin/user.php Thu Jan 01 13:50:40 2009 +0100
@@ -2,13 +2,13 @@
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
-// | Geeklog 1.5 |
+// | Geeklog 1.6 |
// +---------------------------------------------------------------------------+
// | user.php |
// | |
// | Geeklog user administration page. |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors: |
+// | Copyright (C) 2000-2009 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -31,15 +31,13 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
// | |
// +---------------------------------------------------------------------------+
-//
-// $Id: user.php,v 1.209 2008/08/01 18:48:58 blaine Exp $
-
-// Set this to true to get various debug messages from this script
-$_USER_VERBOSE = false;
require_once '../lib-common.php';
require_once 'auth.inc.php';
require_once $_CONF['path_system'] . 'lib-user.php';
+
+// Set this to true to get various debug messages from this script
+$_USER_VERBOSE = false;
$display = '';
@@ -957,7 +955,6 @@
$subject = sprintf($LANG28[81], $_CONF['site_name']);
if ($_CONF['site_mail'] !== $_CONF['noreply_mail']) {
$mailfrom = $_CONF['noreply_mail'];
- global $LANG_LOGIN;
$mailtext .= LB . LB . $LANG04[159];
} else {
$mailfrom = $_CONF['site_mail'];
diff -r d9f30084e9c5 -r c12f857524eb public_html/lib-common.php
--- a/public_html/lib-common.php Thu Jan 01 13:37:41 2009 +0100
+++ b/public_html/lib-common.php Thu Jan 01 13:50:40 2009 +0100
@@ -2,13 +2,13 @@
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
-// | Geeklog 1.5 |
+// | Geeklog 1.6 |
// +---------------------------------------------------------------------------+
// | lib-common.php |
// | |
// | Geeklog common library. |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors: |
+// | Copyright (C) 2000-2009 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -32,8 +32,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
// | |
// +---------------------------------------------------------------------------+
-//
-// $Id: lib-common.php,v 1.728 2008/09/21 08:37:09 dhaun Exp $
// Prevent PHP from reporting uninitialized variables
error_reporting( E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR );
@@ -4113,7 +4111,6 @@
if ($_CONF['site_mail'] !== $_CONF['noreply_mail']) {
$mailfrom = $_CONF['noreply_mail'];
- global $LANG_LOGIN;
$mailtext .= LB . LB . $LANG04[159];
} else {
$mailfrom = $_CONF['site_mail'];
diff -r d9f30084e9c5 -r c12f857524eb public_html/users.php
--- a/public_html/users.php Thu Jan 01 13:37:41 2009 +0100
+++ b/public_html/users.php Thu Jan 01 13:50:40 2009 +0100
@@ -2,13 +2,13 @@
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
-// | Geeklog 1.5 |
+// | Geeklog 1.6 |
// +---------------------------------------------------------------------------+
// | users.php |
// | |
// | User authentication module. |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors: |
+// | Copyright (C) 2000-2009 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -31,8 +31,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
// | |
// +---------------------------------------------------------------------------+
-//
-// $Id: users.php,v 1.170 2008/09/15 18:26:17 mjervis Exp $
/**
* This file handles user authentication
@@ -407,7 +405,6 @@
$subject = $_CONF['site_name'] . ': ' . $LANG04[16];
if ($_CONF['site_mail'] !== $_CONF['noreply_mail']) {
$mailfrom = $_CONF['noreply_mail'];
- global $LANG_LOGIN;
$mailtext .= LB . LB . $LANG04[159];
} else {
$mailfrom = $_CONF['site_mail'];
diff -r d9f30084e9c5 -r c12f857524eb system/lib-user.php
--- a/system/lib-user.php Thu Jan 01 13:37:41 2009 +0100
+++ b/system/lib-user.php Thu Jan 01 13:50:40 2009 +0100
@@ -2,13 +2,13 @@
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
-// | Geeklog 1.5 |
+// | Geeklog 1.6 |
// +---------------------------------------------------------------------------+
// | lib-user.php |
// | |
// | User-related functions needed in more than one place. |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors: |
+// | Copyright (C) 2000-2009 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -31,8 +31,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
// | |
// +---------------------------------------------------------------------------+
-//
-// $Id: lib-user.php,v 1.49 2008/09/21 08:37:12 dhaun Exp $
if (strpos(strtolower($_SERVER['PHP_SELF']), 'lib-user.php') !== false) {
die('This file can not be used on its own!');
@@ -178,7 +176,6 @@
$subject = $_CONF['site_name'] . ': ' . $LANG04[16];
if ($_CONF['site_mail'] !== $_CONF['noreply_mail']) {
$mailfrom = $_CONF['noreply_mail'];
- global $LANG_LOGIN;
$mailtext .= LB . LB . $LANG04[159];
} else {
$mailfrom = $_CONF['site_mail'];
@@ -221,7 +218,6 @@
$subject = $_CONF['site_name'] . ': ' . $LANG04[120];
if ($_CONF['site_mail'] !== $_CONF['noreply_mail']) {
$mailfrom = $_CONF['noreply_mail'];
- global $LANG_LOGIN;
$mailtext .= LB . LB . $LANG04[159];
} else {
$mailfrom = $_CONF['site_mail'];
More information about the geeklog-cvs
mailing list