summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BitUser.php20
-rw-r--r--admin/admin_login_inc.php7
-rw-r--r--bit_setup_inc.php4
-rw-r--r--edit_personal_page.php6
-rw-r--r--login.php6
-rw-r--r--preferences.php8
6 files changed, 35 insertions, 16 deletions
diff --git a/BitUser.php b/BitUser.php
index 9a76f63..9073a17 100644
--- a/BitUser.php
+++ b/BitUser.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.219 2009/03/31 06:15:41 lsces Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.220 2009/04/02 19:48:04 spiderr Exp $
*
* Lib for user administration, groups and permissions
* This lib uses pear so the constructor requieres
@@ -12,7 +12,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: BitUser.php,v 1.219 2009/03/31 06:15:41 lsces Exp $
+ * $Id: BitUser.php,v 1.220 2009/04/02 19:48:04 spiderr Exp $
* @package users
*/
@@ -42,7 +42,7 @@ define( "ACCOUNT_DISABLED", -6 );
* Class that holds all information for a given user
*
* @author spider <spider@steelsun.com>
- * @version $Revision: 1.219 $
+ * @version $Revision: 1.220 $
* @package users
* @subpackage BitUser
*/
@@ -2286,6 +2286,20 @@ class BitUser extends LibertyMime {
}
/**
+ * verifyRegistered
+ *
+ * @access public
+ * @return TRUE if user is registered, otherwise a login dialog is displayed
+ */
+ function verifyRegistered( $pMsg = "" ) {
+ global $gBitSystem;
+ if( !$this->isRegistered() ) {
+ $gBitSystem->fatalPermission( "", $pMsg );
+ }
+ return TRUE;
+ }
+
+ /**
* userExists
*
* @param array $pUserMixed
diff --git a/admin/admin_login_inc.php b/admin/admin_login_inc.php
index f1ae9c2..3ee9a4c 100644
--- a/admin/admin_login_inc.php
+++ b/admin/admin_login_inc.php
@@ -1,5 +1,5 @@
<?php
-// $Header: /cvsroot/bitweaver/_bit_users/admin/admin_login_inc.php,v 1.28 2008/10/18 09:45:05 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_users/admin/admin_login_inc.php,v 1.29 2009/04/02 19:48:11 spiderr Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
@@ -27,6 +27,11 @@ $loginSettings = array(
'type' => "text",
'note' => "Set a url users will be directed to after registration. Default is your site's home page.",
),
+ 'users_login_homepage' => array(
+ 'label' => "After login url",
+ 'type' => "text",
+ 'note' => "Set a custom url where users will be directed after logging in. Default is /users/my.php",
+ ),
'users_eponymous_groups' => array(
'label' => "Create a group for each user",
'type' => "checkbox",
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 0df8156..b8cffba 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_users/bit_setup_inc.php,v 1.49 2008/10/19 10:31:00 nickpalmer Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_users/bit_setup_inc.php,v 1.50 2009/04/02 19:48:07 spiderr Exp $
* @package users
*/
global $gBitDbType, $gBitDbHost, $gBitDbUser, $gBitDbPassword, $gBitDbName, $gBitThemes;
@@ -184,7 +184,7 @@ if( !empty( $theme )) {
if( $gBitUser->isValid() && ( $gBitUser->isRegistered() || !$gBitSystem->isFeatureActive( 'site_hide_my_top_bar_link' ))) {
$menuHash = array(
'package_name' => USERS_PKG_NAME,
- 'index_url' => ( $gBitSystem->isFeatureActive( 'users_preferences' ) ? USERS_PKG_URL.'my.php' : '' ),
+ 'index_url' => ( $gBitSystem->isFeatureActive( 'users_preferences' ) ? $gBitSystem->getConfig( 'users_login_homepage', USERS_PKG_URL.'my.php' ) : '' ),
'menu_title' => 'My '.$gBitSystem->getConfig( 'site_menu_title', $gBitSystem->getConfig( 'site_title', 'Site' )),
'menu_template' => 'bitpackage:users/menu_users.tpl',
);
diff --git a/edit_personal_page.php b/edit_personal_page.php
index cbdbf6e..e2e1acb 100644
--- a/edit_personal_page.php
+++ b/edit_personal_page.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/edit_personal_page.php,v 1.24 2008/06/30 18:14:11 wjames5 Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/edit_personal_page.php,v 1.25 2009/04/02 19:48:07 spiderr Exp $
*
* Copyright (c) 2004 bitweaver.org
* Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: edit_personal_page.php,v 1.24 2008/06/30 18:14:11 wjames5 Exp $
+ * $Id: edit_personal_page.php,v 1.25 2009/04/02 19:48:07 spiderr Exp $
* @package users
* @subpackage functions
*/
@@ -18,6 +18,8 @@
*/
require_once( '../bit_setup_inc.php' );
+$gBitUser->verifyRegistered();
+
// Check if the page has changed
if (isset($_REQUEST["fSavePage"])) {
$gBitUser->store( $_REQUEST );
diff --git a/login.php b/login.php
index f727958..0dc9e27 100644
--- a/login.php
+++ b/login.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/login.php,v 1.12 2009/03/16 20:04:19 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/login.php,v 1.13 2009/04/02 19:48:07 spiderr Exp $
*
* Copyright (c) 2004 bitweaver.org
* Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: login.php,v 1.12 2009/03/16 20:04:19 spiderr Exp $
+ * $Id: login.php,v 1.13 2009/04/02 19:48:07 spiderr Exp $
* @package users
* @subpackage functions
*/
@@ -28,7 +28,7 @@ if( !empty( $_REQUEST['returnto'] ) ) {
}
if( $gBitUser->isRegistered() ) {
- header( 'Location: '.USERS_PKG_URL.'my.php' );
+ header( 'Location: '.$gBitSystem->getConfig( 'users_login_homepage', USERS_PKG_URL.'my.php' ) );
die;
}
diff --git a/preferences.php b/preferences.php
index 27e5777..0247f53 100644
--- a/preferences.php
+++ b/preferences.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.64 2009/03/14 03:05:57 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.65 2009/04/02 19:48:08 spiderr Exp $
*
* Copyright (c) 2004 bitweaver.org
* Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: preferences.php,v 1.64 2009/03/14 03:05:57 spiderr Exp $
+ * $Id: preferences.php,v 1.65 2009/04/02 19:48:08 spiderr Exp $
* @package users
* @subpackage functions
*/
@@ -21,9 +21,7 @@ require_once( '../bit_setup_inc.php' );
// User preferences screen
$gBitSystem->verifyFeature( 'users_preferences' );
-if( !$gBitUser->isRegistered() ) {
- $gBitSystem->fatalError( tra( "You are not logged in" ));
-}
+$gBitUser->verifyRegistered();
$feedback = array();
generated by cgit v1.3 (git 2.53.0) at 2026-07-01 06:13:16 +0000