diff options
49 files changed, 794 insertions, 220 deletions
diff --git a/BitPermUser.php b/BitPermUser.php index 369bc15..a5ee211 100644 --- a/BitPermUser.php +++ b/BitPermUser.php @@ -1,10 +1,34 @@ <?php -// Lib for user administration, groups and permissions -// This lib uses pear so the constructor requieres -// a pear DB object +/** + * $Header: /cvsroot/bitweaver/_bit_users/BitPermUser.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * + * Lib for user administration, groups and permissions + * This lib uses pear so the constructor requieres + * a pear DB object + + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: BitPermUser.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * @package users + */ +/** + * required setup + */ require_once( USERS_PKG_PATH.'BitUser.php' ); +/** + * Class that holds all information for a given user + * + * @author spider <spider@steelsun.com> + * @version $Revision: 1.2 $ + * @package users + * @subpackage BitPermUser + */ class BitPermUser extends BitUser { # var $db; // The PEAR db object used to access the database // change this to an email address to receive debug emails from the LDAP code @@ -141,12 +165,15 @@ class BitPermUser extends BitUser { function getAllGroups( &$pListHash ) { $this->prepGetList( $pListHash ); - if( empty( $pListHash['sort_mode'] ) ) { + if( empty( $pListHash['sort_mode'] ) || $pListHash['sort_mode'] == 'name_asc' ) { $pListHash['sort_mode'] = 'group_name_asc'; } $sortMode = $this->convert_sortmode( $pListHash['sort_mode'] ); - if( !empty( $pListHash['find'] ) ) { + if( !empty( $pListHash['find_groups'] ) ) { + $mid = " WHERE UPPER(`group_name`) like ?"; + $bindvars[] = "%".strtoupper( $pListHash['find_groups'] )."%"; + } elseif( !empty( $pListHash['find'] ) ) { $mid = " WHERE UPPER(`group_name`) like ?"; $bindvars[] = "%".strtoupper( $pListHash['find'] )."%"; } else { @@ -177,8 +204,8 @@ class BitPermUser extends BitUser { $rs->MoveNext(); } } - $query_cant = "select count(*) from `".BIT_DB_PREFIX."users_groups`"; - $cant = $this->getOne($query_cant, false); + $query_cant = "select count(*) from `".BIT_DB_PREFIX."users_groups` $mid"; + $cant = $this->getOne($query_cant, $bindvars); $retval = array(); $retval["data"] = $ret; $retval["cant"] = $cant; diff --git a/BitUser.php b/BitUser.php index dec6869..661e740 100644 --- a/BitUser.php +++ b/BitUser.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.3 2005/06/28 07:37:54 spiderr Exp $ + * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.4 2005/06/28 07:46:22 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.3 2005/06/28 07:37:54 spiderr Exp $ + * $Id: BitUser.php,v 1.4 2005/06/28 07:46:22 spiderr Exp $ * @package users */ @@ -40,7 +40,7 @@ define("ACCOUNT_DISABLED", -6); * Class that holds all information for a given user * * @author spider <spider@steelsun.com> - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * @package users * @subpackage BitUser */ @@ -304,7 +304,7 @@ class BitUser extends LibertyAttachable { $this->mErrors['login'] = tra( "Your username can only contain numbers, characters, and underscores." ); } else { // LOWER CASE all logins - $pParamHash['login'] = strtolower( $pParamHash['login'] ); + $pParamHash['login'] = $pParamHash['login']; $pParamHash['user_store']['login'] = $pParamHash['login']; } } @@ -330,7 +330,9 @@ class BitUser extends LibertyAttachable { if( empty( $pParamHash['email'] ) ) { $this->mErrors['email'] = tra( 'You must enter your email address' ); } - if( $gBitSystem->isFeatureActive( 'validateUsers' ) ) { + // jht 2005-06-22_23:51:58 $pParamHash['admin_add'] is set on adds from admin page - a kludge + // that should be fixed in some better way. + if(empty($pParamHash['admin_add']) && $gBitSystem->isFeatureActive( 'validateUsers' ) ) { $pParamHash['password'] = $this->genPass(); $pParamHash['user_store']['provpass'] = substr( md5( $pParamHash['password'] ), 0, 30 ); $pParamHash['pass_due'] = 0; @@ -352,7 +354,7 @@ class BitUser extends LibertyAttachable { $this->mErrors['password'] = tra( 'Password must contain both letters and numbers' ); } else { // Generate a unique hash - $pParamHash['user_store']['hash'] = md5( $pParamHash['login'].$pParamHash['password'].$pParamHash['email'] ); + $pParamHash['user_store']['hash'] = md5( strtolower( $pParamHash['login'] ).$pParamHash['password'].$pParamHash['email'] ); $now = date("U"); if( !isset( $pParamHash['pass_due'] ) && $gBitSystem->getPreference('pass_due') ) { $pParamHash['user_store']['pass_due'] = $now + (60 * 60 * 24 * $gBitSystem->getPreference('pass_due') ); @@ -377,17 +379,13 @@ class BitUser extends LibertyAttachable { } else { $errors = array(); } - if( !empty( $this ) && is_object( $this ) ) { - // we might be having this called statically - $userInfo = $this->getUserInfo( array( 'email' => $pEmail ) ); - } if( !eregi ( '^[-!#$%&\`*+\\./0-9=?A-Z^_`a-z{|}~]+'.'@'. '(localhost|[-!$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.'. '[-!$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+)$' , $pEmail ) ) { $errors['email'] = 'The email address "'.$pEmail.'" is invalid.'; - } elseif( !empty( $userInfo['user_id'] ) ) { + } elseif( !empty( $this ) && is_object( $this ) && $this->userExists( array( 'email' => $pEmail ) ) ) { $errors['email'] = 'The email address "'.$pEmail.'" has already been registered.'; } elseif( $gBitSystem->isFeatureActive( 'validateUsers' ) ) { list ( $Username, $domain ) = split ("@",$pEmail); @@ -566,15 +564,11 @@ if ($gDebug) echo "Run : QUIT<br>"; return( md5(BitSystem::genPass()) ); } - function validate_hash($user, $hash) { - return $this->mDb->getOne( "select count(*) from `".BIT_DB_PREFIX."users_users` where " . $this->convert_binary(). " `login` = ? and `hash`=?", array($user, $hash) ); - } - function login( $pLogin, $pPassword, $pChallenge=NULL, $pResponse=NULL ) { global $gBitSystem, $user_cookie_site; $isvalid = false; // Verify user is valid - if( $this->validate_user($pLogin, $pPassword, $pChallenge, $pResponse) ) { + if( $this->validate($pLogin, $pPassword, $pChallenge, $pResponse) ) { $loginCol = strpos( $pLogin, '@' ) ? 'email' : 'login'; $userInfo = $this->getUserInfo( array( $loginCol => $pLogin ) ); // If the password is valid but it is due then force the user to change the password by @@ -625,7 +619,7 @@ if ($gDebug) echo "Run : QUIT<br>"; return( $url ); } - function validate_user($user, $pass, $challenge, $response) { + function validate($user, $pass, $challenge, $response) { global $gBitSystem; // these will help us keep tabs of what is going on $userTikiValid = false; @@ -638,7 +632,7 @@ if ($gDebug) echo "Run : QUIT<br>"; $create_auth = ($gBitSystem->getPreference("auth_create_user_auth", "n") == "y"); $skip_admin = ($gBitSystem->getPreference("auth_skip_admin", "n") == "y"); // first attempt a login via the standard Tiki system - $userId = $this->validate_gBitDbUser($user, $pass, $challenge, $response); + $userId = $this->validateBitUser($user, $pass, $challenge, $response); if ($userId) { $userTikiValid = true; $userTikiPresent = true; @@ -652,7 +646,7 @@ if ($gDebug) echo "Run : QUIT<br>"; } elseif ( $auth_pear ) { // next see if we need to check LDAP // check the user account - $result = $this->validate_user_auth($user, $pass); + $result = $this->validateAuth($user, $pass); switch ($result) { case USER_VALID: unset($this->mErrors['login']); @@ -741,7 +735,7 @@ echo "userAuthPresent: $userAuthPresent<br>"; return( count( $this->mErrors ) == 0 ); } // validate the user in the PEAR::Auth system - function validate_user_auth($user, $pass) { + function validateAuth($user, $pass) { global $gBitSystem; require_once (UTIL_PKG_PATH."pear/Auth/Auth.php"); // just make sure we're supposed to be here @@ -795,8 +789,8 @@ echo "userAuthPresent: $userAuthPresent<br>"; return $ret; } - // validate the user in the Tiki database - function validate_gBitDbUser( $pLogin, $pass, $challenge, $response ) { + // validate the user in the bitweaver database - validation is case insensitive, and we like it that way! + function validateBitUser( $pLogin, $pass, $challenge, $response ) { global $gBitSystem; $ret = NULL; if( empty( $pLogin ) ) { @@ -804,10 +798,11 @@ echo "userAuthPresent: $userAuthPresent<br>"; } elseif( empty( $pass ) ) { $this->mErrors['login'] = 'Password incorrect'; } else { - $loginCol = strpos( $pLogin, '@' ) ? 'email' : 'login'; + $loginVal = strtoupper( $pLogin ); // case insensitive login + $loginCol = ' UPPER(`'.(strpos( $pLogin, '@' ) ? 'email' : 'login').'`)'; // first verify that the user exists - $query = "select `email`, `login`, `user_id`, `password` from `".BIT_DB_PREFIX."users_users` where " . $this->convert_binary(). " UPPER(`$loginCol`) = ?"; - $result = $this->query( $query, array( strtoupper($pLogin) ) ); + $query = "select `email`, `login`, `user_id`, `password` from `".BIT_DB_PREFIX."users_users` where " . $this->convert_binary(). " $loginCol = ?"; + $result = $this->query( $query, array( $loginVal ) ); if( !$result->numRows() ) { $this->mErrors['login'] = 'User not found'; } else { @@ -820,8 +815,8 @@ echo "userAuthPresent: $userAuthPresent<br>"; // next verify the password with 2 hashes methods, the old one (pass)) and the new one (login.pass;email) // TODO - this needs cleaning up - wolff_borg if( !$gBitSystem->isFeatureActive( 'feature_challenge' ) || empty($response) ) { - $query = "select `user_id` from `".BIT_DB_PREFIX."users_users` where " . $this->convert_binary(). " `$loginCol` = ? and (`hash`=? or `hash`=?)"; - $result = $this->query( $query, array( $pLogin, $hash, $hash2 ) ); + $query = "select `user_id` from `".BIT_DB_PREFIX."users_users` where " . $this->convert_binary(). " $loginCol = ? and (`hash`=? or `hash`=?)"; + $result = $this->query( $query, array( $loginVal, $hash, $hash2 ) ); if ($result->numRows()) { $query = "update `".BIT_DB_PREFIX."users_users` set `last_login`=`current_login`, `current_login`=? where `user_id`=?"; $result = $this->query($query, array( (int)date("U"), $userId )); @@ -832,14 +827,14 @@ echo "userAuthPresent: $userAuthPresent<br>"; } else { // Use challenge-reponse method // Compare pass against md5(user,challenge,hash) - $hash = $this->getOne("select `hash` from `".BIT_DB_PREFIX."users_users` where " . $this->convert_binary(). " `$loginCol`=?", array( $pLogin ) ); + $hash = $this->getOne("select `hash` from `".BIT_DB_PREFIX."users_users` where " . $this->convert_binary(). " $loginCol = ?", array( $pLogin ) ); if (!isset($_SESSION["challenge"])) { $this->mErrors['login'] = 'Invalid challenge'; } //print("pass: $pass user: $user hash: $hash <br/>"); //print("challenge: ".$_SESSION["challenge"]." challenge: $challenge<br/>"); //print("response : $response<br/>"); - if ($response == md5($user . $hash . $_SESSION["challenge"])) { + if ($response == md5( strtolower($user) . $hash . $_SESSION["challenge"]) ) { $ret = $userId; $this->update_lastlogin( $userId ); } else { @@ -955,8 +950,8 @@ echo "userAuthPresent: $userAuthPresent<br>"; $ret = NULL; if( is_array( $pUserMixed ) ) { $query = "SELECT uu.* FROM `".BIT_DB_PREFIX."users_users` uu LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON (tc.`content_id`=uu.`content_id`) - WHERE uu.`".key( $pUserMixed )."` = ?"; - $ret = $this->mDb->GetRow( $query, array( current( $pUserMixed ) ) ); + WHERE UPPER( uu.`".key( $pUserMixed )."` ) = ?"; + $ret = $this->mDb->GetRow( $query, array( strtoupper( current( $pUserMixed ) ) ) ); } return $ret; } @@ -1426,7 +1421,21 @@ echo "userAuthPresent: $userAuthPresent<br>"; $this->query($sql, array($newRealName, $this->mUserId)); } } - + + function storeLogin($newLogin) { + $newLogin = substr($newLogin,0,40); + if ($this->userExists(array('login' => $newLogin))) { + $this->mErrors[] = "The username '$newLogin' is already taken"; + } elseif ($this->mUserId) { + $sql = "UPDATE `".BIT_DB_PREFIX."users_users` SET `login` = ? WHERE `user_id` = ?"; + $rs = $this->query($sql, array($newLogin, $this->mUserId)); + } else { + $this->mErrors[] = "Invalid user"; + } + + return (count($this->mErrors) == 0); + } + function getList( &$pParamHash ) { if ( !isset( $pParamHash['sort_mode']) or $pParamHash['sort_mode'] == '' ) $pParamHash['sort_mode'] = 'registration_date_desc'; diff --git a/admin/index.php b/admin/index.php index 49471a2..7b2546c 100644 --- a/admin/index.php +++ b/admin/index.php @@ -1,5 +1,5 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/admin/index.php,v 1.1 2005/06/19 05:12:23 bitweaver Exp $ +// $Header: /cvsroot/bitweaver/_bit_users/admin/index.php,v 1.2 2005/06/28 07:46:23 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. @@ -73,6 +73,8 @@ if (isset($_REQUEST["newuser"])) { $newUser = new BitPermUser(); // Check if the user already exists + // jht 2005-06-22_23:51:58 flag this user store as coming from admin page -- a kludge + $_REQUEST['admin_add'] = 1; if( $newUser->store( $_REQUEST ) ) { $smarty->assign( 'addSuccess', "User Added Successfully" ); } else { diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index fdee07c..14dfe8a 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -175,6 +175,9 @@ array( 'QUERY' => "UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`=replace(`perm_name`,'tiki_','bit_')", "UPDATE `".BIT_DB_PREFIX."users_objectpermissions` SET `perm_name`=replace(`perm_name`,'tiki_','bit_')", + + + "INSERT INTO `".BIT_DB_PREFIX."users_users` (`real_name`, `login`, `email`, `user_id` ) VALUES ('Anonymous', 'anonymous', 'anonymous@localhost', ".ANONYMOUS_USER_ID.")", // TikiWiki assigns the creator user foreign key as 'system' even if there is now 'system' user - XOXO spiderr // In order for all pages to upgrade, there must be at least an 'admin' and 'system' user diff --git a/assigned_modules.php b/assigned_modules.php index 1c166dd..236aaf8 100644 --- a/assigned_modules.php +++ b/assigned_modules.php @@ -1,11 +1,24 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/assigned_modules.php,v 1.1 2005/06/19 05:12:22 bitweaver Exp $ -// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. +/** + * assigned_modules + * + * @author spider <spider@steelsun.com> + * @version $Revision: 1.2 $ + * @package users + * @subpackage functions + * @copyright Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. + * @license Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. + */ +// $Header: /cvsroot/bitweaver/_bit_users/assigned_modules.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ // 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. // Initialization + global $gEditMode; $gEditMode = 'layout'; + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once( KERNEL_PKG_PATH.'mod_lib.php' ); diff --git a/bit_setup_inc.php b/bit_setup_inc.php index e328887..9ddbd11 100644 --- a/bit_setup_inc.php +++ b/bit_setup_inc.php @@ -85,7 +85,7 @@ if( !defined( 'LOGO_MAX_DIM' ) ) { // if the auth method is 'web site', look for the username in $_SERVER if ($auth_method == 'ws') { if (isset($_SERVER['REMOTE_USER'])) { - if ($gBitUser->exists($_SERVER['REMOTE_USER'])) { + if ($gBitUser->userExists($_SERVER['REMOTE_USER'])) { $_SESSION[$user_cookie_site] = $_SERVER['REMOTE_USER']; } } diff --git a/bookmark_lib.php b/bookmark_lib.php index 3e36be2..1457a0d 100644 --- a/bookmark_lib.php +++ b/bookmark_lib.php @@ -1,4 +1,25 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/bookmark_lib.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * + * Lib for user administration, groups and permissions + * This lib uses pear so the constructor requieres + * a pear DB object + + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: bookmark_lib.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * @package users + */ + +/** + * @package users + * @subpackage BookmarkLib + */ class BookmarkLib extends BitBase { function BookmarkLib() { BitBase::BitBase(); diff --git a/bookmarks.php b/bookmarks.php index 88b4515..0b4fae8 100644 --- a/bookmarks.php +++ b/bookmarks.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/Attic/bookmarks.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/bookmarks.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: bookmarks.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once( USERS_PKG_PATH.'bookmark_lib.php' ); if (!$gBitUser->hasPermission( 'bit_p_create_bookmarks' )) { diff --git a/cached_bookmark.php b/cached_bookmark.php index 2775f9d..eca8396 100644 --- a/cached_bookmark.php +++ b/cached_bookmark.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/Attic/cached_bookmark.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/cached_bookmark.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: cached_bookmark.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once( USERS_PKG_PATH.'bookmark_lib.php' ); if (!$gBitUser->mUserId) { diff --git a/change_password.php b/change_password.php index 0108560..9e9179c 100644 --- a/change_password.php +++ b/change_password.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/change_password.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/change_password.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: change_password.php,v 1.2 2005/06/28 07:46:22 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); if (!isset($_REQUEST['login'])) $_REQUEST['login'] = ''; @@ -12,29 +24,19 @@ if (!isset($_REQUEST["oldpass"])) $smarty->assign('login', $_REQUEST['login']); $smarty->assign('oldpass', $_REQUEST["oldpass"]); if (isset($_REQUEST["change"])) { - + if ($_REQUEST["pass"] != $_REQUEST["pass2"]) { - $smarty->assign('msg', tra("The passwords didn't match")); - $gBitSystem->display( 'error.tpl' ); - die; + $gBitSystem->fatalError( tra("The passwords didn't match") ); } if ($_REQUEST["pass"] == $_REQUEST["oldpass"]) { - $smarty->assign('msg', tra("You can not use the same password again")); - $gBitSystem->display( 'error.tpl' ); - die; + $gBitSystem->fatalError( tra("You can not use the same password again") ); } - if (!$gBitUser->validate_user($_REQUEST['login'], $_REQUEST["oldpass"], '', '')) { - if(!$gBitUser->validate_user("admin",substr($_REQUEST["oldpass"],6,200),'','') or (!$gBitUser->isAdmin())) { - $smarty->assign('msg', tra("Invalid old password")); - $gBitSystem->display( 'error.tpl' ); - die; - } + if( !$gBitUser->isAdmin() && !$gBitUser->validate($_REQUEST['login'], $_REQUEST["oldpass"], '', '') ) { + $gBitSystem->fatalError( tra("Invalid old password") ); } //Validate password here if (strlen($_REQUEST["pass"]) < $min_pass_length) { - $smarty->assign('msg', tra("Password should be at least"). ' ' . $min_pass_length . ' ' . tra("characters long")); - $gBitSystem->display( 'error.tpl' ); - die; + $gBitSystem->fatalError( tra("Password should be at least"). ' ' . $min_pass_length . ' ' . tra("characters long") ); } // Check this code if ($pass_chr_num == 'y') { diff --git a/confirm.php b/confirm.php index 3c2b420..8c7afd8 100644 --- a/confirm.php +++ b/confirm.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/confirm.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/confirm.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: confirm.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); if( $userInfo = $gBitUser->confirmRegistration( $_REQUEST["user"], $_REQUEST["pass"] ) ) { diff --git a/custom_home.php b/custom_home.php index bf512a4..6424b2a 100644 --- a/custom_home.php +++ b/custom_home.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/custom_home.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/custom_home.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: custom_home.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); //ini_set('include_path','.;pear/'); //include('foobar.php'); diff --git a/display_bituser_inc.php b/display_bituser_inc.php index c9eda47..baf7dd3 100644 --- a/display_bituser_inc.php +++ b/display_bituser_inc.php @@ -1,4 +1,21 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/display_bituser_inc.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: display_bituser_inc.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ // this first version is a bit incomplete, but at least things work now. - spiderr diff --git a/download_userfile.php b/download_userfile.php index f2cf93e..caec652 100644 --- a/download_userfile.php +++ b/download_userfile.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/Attic/download_userfile.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/download_userfile.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: download_userfile.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once (USERS_PKG_PATH.'userfiles_lib.php'); if (!isset($_REQUEST["file_id"])) { diff --git a/edit_personal_page.php b/edit_personal_page.php index 234ceb3..934fe17 100644 --- a/edit_personal_page.php +++ b/edit_personal_page.php @@ -1,8 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/edit_personal_page.php,v 1.1 2005/06/19 05:12:21 bitweaver Exp $ -// Copyright (c) 2004 bitweaver.org - Christian Fowler, Stephan Borgm, Andrew Slater, 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. +/** + * $Header: /cvsroot/bitweaver/_bit_users/edit_personal_page.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: edit_personal_page.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); // Check if the page has changed @@ -1,8 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/Attic/files.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/files.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: files.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once ( USERS_PKG_PATH.'userfiles_lib.php'); if ($feature_userfiles != 'y') { @@ -1,11 +1,22 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/index.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// we need to do this before _ANYTHING_ else so we can limit all module queries to this homepage +/** + * $Header: /cvsroot/bitweaver/_bit_users/index.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: index.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ global $gQueryUserId, $gBitSystem; -// Initialization + +/** + * required setup + */ define('ACTIVE_PACKAGE', 'users'); // Todo: use a different $_SERVER variable to properly determine the active package require_once( '../bit_setup_inc.php' ); global $gBitSystem; @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/login.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -# $Header: /cvsroot/bitweaver/_bit_users/login.php,v 1.1 2005/06/19 05:12:22 bitweaver Exp $ +/** + * $Header: /cvsroot/bitweaver/_bit_users/login.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: login.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ include_once ("../bit_setup_inc.php"); if( $gBitUser->isRegistered() ) { @@ -1,10 +1,23 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/logout.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/logout.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: logout.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + $bypass_siteclose_check = 'y'; + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); global $gBitSystem; // go offline in Live Support diff --git a/lookup_user_inc.php b/lookup_user_inc.php index 1268190..07eddb2 100644 --- a/lookup_user_inc.php +++ b/lookup_user_inc.php @@ -1,13 +1,22 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/lookup_user_inc.php,v 1.1 2005/06/19 05:12:21 bitweaver Exp $ -// Copyright (c) 2004, bitweaver, Christian Fowler, Brian Todoroff, 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. -// -// This is a centralized include file to setup $gQueryUser var if you need to display detailed information about any arbitrary user. -// +/** + * $Header: /cvsroot/bitweaver/_bit_users/lookup_user_inc.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: lookup_user_inc.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ global $gQueryUser; +/** + * This is a centralized include file to setup $gQueryUser var if you need to display detailed information about any arbitrary user. + */ // Keep backward compatability if (isset($_REQUEST['fHomepage'])) { $_REQUEST['home'] = $_REQUEST['fHomepage']; @@ -1,8 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/Attic/menu.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/menu.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: menu.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once( USERS_PKG_PATH.'user_menu_lib.php' ); if ($feature_usermenu != 'y') { diff --git a/module_controls_inc.php b/module_controls_inc.php index 6433db4..d2a0957 100644 --- a/module_controls_inc.php +++ b/module_controls_inc.php @@ -1,8 +1,18 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/module_controls_inc.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. +/** + * $Header: /cvsroot/bitweaver/_bit_users/module_controls_inc.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: module_controls_inc.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + $check_req = (isset($_REQUEST["mc_unassign"]) || isset($_REQUEST["mc_up"]) || isset($_REQUEST["mc_down"]) diff --git a/modules/mod_online_users.php b/modules/mod_online_users.php index 080aec0..efd0942 100644 --- a/modules/mod_online_users.php +++ b/modules/mod_online_users.php @@ -1,4 +1,17 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/modules/mod_online_users.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: mod_online_users.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage modules + */ global $gBitUser; $online_users = $gBitUser->get_online_users(); $smarty->assign('online_users', $online_users); diff --git a/modules/mod_since_last_visit.php b/modules/mod_since_last_visit.php index 7120987..12640fd 100644 --- a/modules/mod_since_last_visit.php +++ b/modules/mod_since_last_visit.php @@ -1,4 +1,17 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/modules/mod_since_last_visit.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: mod_since_last_visit.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * @package users + * @subpackage modules + */ $nvi_info = $gBitSystem->get_news_from_last_visit($user); $smarty->assign('nvi_info', $nvi_info); ?>
\ No newline at end of file diff --git a/modules/mod_user_bookmarks.php b/modules/mod_user_bookmarks.php index 4d22aed..75507c5 100644 --- a/modules/mod_user_bookmarks.php +++ b/modules/mod_user_bookmarks.php @@ -1,6 +1,22 @@ <?php -if( $gBitSystem->isFeatureActive( 'feature_user_bookmarks' ) && $gBitUser->isRegistered() && $gBitUser->hasPermission( 'bit_p_create_bookmarks' ) ) { +/** + * $Header: /cvsroot/bitweaver/_bit_users/modules/Attic/mod_user_bookmarks.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: mod_user_bookmarks.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * @package users + * @subpackage modules + */ +if( $gBitSystem->isFeatureActive( 'feature_user_bookmarks' ) && $gBitUser->isRegistered() && $gBitUser->hasPermission( 'bit_p_create_bookmarks' ) ) { + /** + * required setup + */ include_once( USERS_PKG_PATH.'bookmark_lib.php' ); $setup_parsed_uri = parse_url($_SERVER["REQUEST_URI"]); diff --git a/modules/mod_user_image_galleries.php b/modules/mod_user_image_galleries.php index 3395b87..2ae4870 100644 --- a/modules/mod_user_image_galleries.php +++ b/modules/mod_user_image_galleries.php @@ -1,4 +1,17 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/modules/Attic/mod_user_image_galleries.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: mod_user_image_galleries.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * @package users + * @subpackage modules + */ $ranking = $gBitSystem->get_user_galleries($user, $module_rows); $smarty->assign('modUserG', $ranking); ?> diff --git a/modules/mod_user_pages.php b/modules/mod_user_pages.php index d60ae01..54fe3af 100644 --- a/modules/mod_user_pages.php +++ b/modules/mod_user_pages.php @@ -1,4 +1,17 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/modules/mod_user_pages.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: mod_user_pages.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * @package users + * @subpackage modules + */ $ranking = $gBitSystem->get_user_pages($user, $module_rows); $smarty->assign('modUserPages', $ranking); ?> diff --git a/modules/mod_user_profile.php b/modules/mod_user_profile.php index 434c078..7cc1bf7 100644 --- a/modules/mod_user_profile.php +++ b/modules/mod_user_profile.php @@ -1,10 +1,19 @@ <?php -// +---------------------------------------------------------------------- -// | PHP Source -// +---------------------------------------------------------------------- -// | Copyright (C) 2004 by bitweaver - cfowler, btodoroff, et al -// +---------------------------------------------------------------------- +/** + * $Header: /cvsroot/bitweaver/_bit_users/modules/mod_user_profile.php,v 1.3 2005/06/28 07:46:24 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: mod_user_profile.php,v 1.3 2005/06/28 07:46:24 spiderr Exp $ + * @package users + * @subpackage modules + */ global $gQueryUser, $gBitUser, $smarty; + if( !empty( $gQueryUser->mInfo ) ) { $smarty->assign_by_ref('userInfo', $gQueryUser->mInfo ); } elseif( !empty( $gBitUser->mInfo ) ) { diff --git a/modules/mod_user_tasks.php b/modules/mod_user_tasks.php index 1a600ba..cbdc72a 100644 --- a/modules/mod_user_tasks.php +++ b/modules/mod_user_tasks.php @@ -1,4 +1,21 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/modules/Attic/mod_user_tasks.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: mod_user_tasks.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * @package users + * @subpackage modules + */ + +/** + * required setup + */ require_once(USERS_PKG_PATH."task_lib.php"); global $user, $feature_tasks, $bit_p_tasks, $tasklib; diff --git a/modules/mod_who_is_there.php b/modules/mod_who_is_there.php index f96ea56..e09a2fe 100644 --- a/modules/mod_who_is_there.php +++ b/modules/mod_who_is_there.php @@ -1,4 +1,17 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/modules/mod_who_is_there.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: mod_who_is_there.php,v 1.2 2005/06/28 07:46:24 spiderr Exp $ + * @package users + * @subpackage modules + */ global $userlib; $logged_users = $gBitUser->count_sessions(); $online_users = $gBitUser->get_online_users(); @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/my.php,v 1.2 2005/06/21 17:02:33 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/my.php,v 1.3 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: my.php,v 1.3 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once( USERS_PKG_PATH.'task_lib.php' ); diff --git a/my_files.php b/my_files.php index ff64523..cd17fee 100644 --- a/my_files.php +++ b/my_files.php @@ -1,4 +1,21 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/my_files.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: my_files.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once("../bit_setup_inc.php"); global $gBitSystem; diff --git a/my_groups.php b/my_groups.php index 53e60d0..9749499 100644 --- a/my_groups.php +++ b/my_groups.php @@ -1,11 +1,22 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/my_groups.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization -require_once( '../bit_setup_inc.php' ); +/** + * $Header: /cvsroot/bitweaver/_bit_users/my_groups.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: my_groups.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ +/** + * required setup + */ +require_once( '../bit_setup_inc.php' ); // PERMISSIONS: registered user required if( !$gBitUser->isRegistered() ) { diff --git a/my_images.php b/my_images.php index 99a1c35..99b7573 100644 --- a/my_images.php +++ b/my_images.php @@ -1,13 +1,23 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/my_images.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization - +/** + * $Header: /cvsroot/bitweaver/_bit_users/my_images.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: my_images.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ global $gEditMode; $gEditMode = 'images'; +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); // User preferences screen diff --git a/preferences.php b/preferences.php index a822878..bf76c5d 100644 --- a/preferences.php +++ b/preferences.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.2 2005/06/21 17:02:33 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.3 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: preferences.php,v 1.3 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once( KERNEL_PKG_PATH.'mod_lib.php' ); if( $gBitSystem->isPackageActive( 'wiki' ) ) { @@ -95,9 +107,9 @@ if (isset($_REQUEST["prefs"])) { die; } if (isset($_REQUEST['chgemail'])) { - + // check user's password - if (!$editUser->validate_user($editUser->mUsername, $_REQUEST['pass'], '', '')) { + if (!$editUser->validate($editUser->mUsername, $_REQUEST['pass'], '', '')) { $smarty->assign('msg', tra("Invalid password. You current password is required to change your email address.")); $gBitSystem->display( 'error.tpl' ); die; @@ -107,37 +119,21 @@ if (isset($_REQUEST['chgemail'])) { } } if (isset($_REQUEST["chgpswd"])) { - + if( $_REQUEST["pass1"] != $_REQUEST["pass2"] ) { - $smarty->assign('msg', tra("The passwords didn't match")); - $gBitSystem->display( 'error.tpl' ); - die; + $gBitSystem->fatalError( tra("The passwords didn't match") ); } - if( $gBitUser->isAdmin() ) { - if( !$editUser->validate_user( $editUser->mUsername, $_REQUEST["old"], '', '' ) && empty( $_REQUEST['view_user'] ) ) { - $smarty->assign('msg', tra( "Invalid old password" ) ); - $gBitSystem->display( 'error.tpl' ); - die; - } - } else { - if( !$editUser->validate_user( $editUser->mUsername, $_REQUEST["old"], '', '' ) ) { - $smarty->assign('msg', tra( "Invalid old password" ) ); - $gBitSystem->display( 'error.tpl' ); - die; - } + if( !$gBitUser->isAdmin() && !$editUser->validate( $editUser->mUsername, $_REQUEST["old"], '', '' ) ) { + $gBitSystem->fatalError( tra( "Invalid old password" ) ); } //Validate password here if (strlen($_REQUEST["pass1"]) < $min_pass_length) { - $smarty->assign('msg', tra("Password should be at least"). ' ' . $min_pass_length . ' ' . tra("characters long")); - $gBitSystem->display( 'error.tpl' ); - die; + $gBitSystem->fatalError( tra("Password should be at least"). ' ' . $min_pass_length . ' ' . tra("characters long") ); } // Check this code if ($pass_chr_num == 'y') { if (!preg_match_all("/[0-9]+/", $_REQUEST["pass1"], $foo) || !preg_match_all("/[A-Za-z]+/", $_REQUEST["pass1"], $foo)) { - $smarty->assign('msg', tra("Password must contain both letters and numbers")); - $gBitSystem->display( 'error.tpl' ); - die; + $gBitSystem->fatalError(tra("Password must contain both letters and numbers") ); } } if( $gBitUser->change_user_password($editUser->mUsername, $_REQUEST["pass1"]) ) { @@ -145,7 +141,7 @@ if (isset($_REQUEST["chgpswd"])) { } } if (isset($_REQUEST['messprefs'])) { - + $editUser->storePreference( 'mess_maxRecords', $_REQUEST['mess_maxRecords']); $editUser->storePreference( 'minPrio', $_REQUEST['minPrio']); if (isset($_REQUEST['allowMsgs']) && $_REQUEST['allowMsgs'] == 'on') { @@ -155,7 +151,7 @@ if (isset($_REQUEST['messprefs'])) { } } if (isset($_REQUEST['mybitweaverprefs'])) { - + if (isset($_REQUEST['mybitweaver_pages']) && $_REQUEST['mybitweaver_pages'] == 'on') { $editUser->storePreference( 'mybitweaver_pages', 'y'); } else { @@ -188,7 +184,7 @@ if (isset($_REQUEST['mybitweaverprefs'])) { } } if (isset($_REQUEST['tasksprefs'])) { - + $editUser->storePreference( 'tasks_maxRecords', $_REQUEST['tasks_maxRecords']); if (isset($_REQUEST['tasks_use_dates']) && $_REQUEST['tasks_use_dates'] == 'on') { $editUser->storePreference( 'tasks_use_dates', 'y'); diff --git a/random_num_img.php b/random_num_img.php index 5c13223..4ea8876 100644 --- a/random_num_img.php +++ b/random_num_img.php @@ -1,8 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/Attic/random_num_img.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/random_num_img.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: random_num_img.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ //session_start(); // hmm. to many session tweaks in setup_smarty ... we need to call this require_once( '../bit_setup_inc.php' ); diff --git a/register.php b/register.php index be66d6e..7fe283c 100644 --- a/register.php +++ b/register.php @@ -1,5 +1,21 @@ <?php -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/register.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: register.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); require_once( KERNEL_PKG_PATH.'BitBase.php' ); include_once( KERNEL_PKG_PATH.'notification_lib.php' ); diff --git a/remind_password.php b/remind_password.php index bcbed4d..cc07d94 100644 --- a/remind_password.php +++ b/remind_password.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/remind_password.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/remind_password.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: remind_password.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); if ($forgotPass != 'y') { $smarty->assign('msg', tra("This feature is disabled").": forgotPass"); diff --git a/show_user_avatar.php b/show_user_avatar.php index 0ec4185..f2194b5 100644 --- a/show_user_avatar.php +++ b/show_user_avatar.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/show_user_avatar.php,v 1.1 2005/06/19 05:12:21 bitweaver 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. -# $Header: /cvsroot/bitweaver/_bit_users/show_user_avatar.php,v 1.1 2005/06/19 05:12:21 bitweaver Exp $ +/** + * $Header: /cvsroot/bitweaver/_bit_users/show_user_avatar.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: show_user_avatar.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ include_once( USERS_PKG_PATH.'userprefs_lib.php' ); // application to display an image from the database with // option to resize the image dynamically creating a thumbnail on the fly. diff --git a/task_lib.php b/task_lib.php index 28784d6..ac852c6 100644 --- a/task_lib.php +++ b/task_lib.php @@ -1,7 +1,23 @@ <?php -/* Task properties: - user, task_id, title, description, date, status, priority, completed, percentage -*/ +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/task_lib.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: task_lib.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + */ + +/** + * Task properties: + * user, task_id, title, description, date, status, priority, completed, percentage + * @package users + * @subpackage TaskLib + */ class TaskLib extends BitBase { function TaskLib() { @@ -1,8 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/Attic/tasks.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/tasks.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: tasks.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once( USERS_PKG_PATH.'task_lib.php' ); if ($feature_tasks != 'y') { diff --git a/templates/user_assigned_modules.tpl b/templates/user_assigned_modules.tpl index 4f3d462..a0d24fd 100644 --- a/templates/user_assigned_modules.tpl +++ b/templates/user_assigned_modules.tpl @@ -144,7 +144,9 @@ </div> {/form} {/jstab} + {/if} + {if $gBitSystemPrefs.feature_user_theme eq 'y' or $gBitSystemPrefs.feature_user_theme eq 'h'} {jstab title="Select Theme"} {form legend="Select Theme"} <div class="row"> diff --git a/templates/user_menu.tpl b/templates/user_menu.tpl index 5c49825..1eec066 100644 --- a/templates/user_menu.tpl +++ b/templates/user_menu.tpl @@ -7,7 +7,7 @@ {if $opensec eq 'y'}</div>{/if} {if $gBitSystemPrefs.feature_menusfolderstyle eq 'y'} - <a class="menuhead" href="javascript:icntoggle('menu{$cname}');">{biticon ipackage=liberty iname="folder" name="menu`$cname`img" iexplain="folder"} + <a class="menuhead" href="javascript:icntoggle('menu{$cname}');">{biticon ipackage=liberty iname="collapsed" name="menu`$cname`img" iexplain="folder"} {else} <a class="menuhead" href="javascript:toggle('menu{$cname}');"> {/if} @@ -1,6 +1,23 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/theme.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: theme.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ global $gEditMode; $gEditMode = 'theme'; + +/** + * required setup + */ include_once( '../bit_setup_inc.php' ); include_once( USERS_PKG_PATH.'BitUser.php' ); include_once( THEMES_PKG_PATH.'css_lib.php' ); diff --git a/user_menu_lib.php b/user_menu_lib.php index df1c146..595ec2c 100644 --- a/user_menu_lib.php +++ b/user_menu_lib.php @@ -1,4 +1,21 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/user_menu_lib.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: user_menu_lib.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + */ + +/** + * @package users + * @subpackage UserMenuLib + */ class UserMenuLib extends BitBase { function UserMenuLib() { BitBase::BitBase(); diff --git a/userfiles_lib.php b/userfiles_lib.php index 13c045a..d7ba2df 100644 --- a/userfiles_lib.php +++ b/userfiles_lib.php @@ -1,4 +1,21 @@ <?php +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/userfiles_lib.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: userfiles_lib.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + */ + +/** + * @package users + * @subpackage UserFilesLib + */ class UserFilesLib extends BitBase { function UserFilesLib() { BitBase::BitBase(); diff --git a/validate.php b/validate.php index 2a1fb1d..fe9b74c 100644 --- a/validate.php +++ b/validate.php @@ -1,9 +1,22 @@ <?php -// 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/validate.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: validate.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ $bypass_siteclose_check = 'y'; + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); global $gBitSystem; /* diff --git a/versions.php b/versions.php index 2cb58d3..fb49084 100644 --- a/versions.php +++ b/versions.php @@ -1,9 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/Attic/versions.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. -// Initialization +/** + * $Header: /cvsroot/bitweaver/_bit_users/Attic/versions.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: versions.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ require_once( '../bit_setup_inc.php' ); include_once( WIKI_PKG_PATH.'hist_lib.php'); if ($feature_wiki != 'y') { diff --git a/watches.php b/watches.php index 62c9f06..ee8f0a8 100644 --- a/watches.php +++ b/watches.php @@ -1,8 +1,21 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_users/watches.php,v 1.1 2005/06/19 05:12:22 bitweaver 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. +/** + * $Header: /cvsroot/bitweaver/_bit_users/watches.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * + * Copyright (c) 2004 bitweaver.org + * Copyright (c) 2003 tikwiki.org + * 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 + * + * $Id: watches.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * @package users + * @subpackage functions + */ + +/** + * required setup + */ include_once( '../bit_setup_inc.php' ); $user = $gBitUser->mUserId; if (!$user) { |