makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed need to send db as a parameter to functions

Browse source 
git-svn-id: file:///svn/phpbb/trunk@189 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-04-19 15:05:39 +00:00
parent 4c05450291
commit 87b7ae578f
6 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/auth.php
View file

@ -31,9 +31,10 @@
* TRUE if the user authorized * TRUE if the user authorized
* FALSE if the user is not * FALSE if the user is not
*/ */
function auth($type, $db, $id = "", $user_ip = "") function auth($type, $id = "", $user_ip = "")
{ {
global $userdata; global $db, $userdata;
switch($type) switch($type)
{ {
// Empty for the moment. // Empty for the moment.
@ -45,8 +46,10 @@ function auth($type, $db, $id = "", $user_ip = "")
* The following functions are used for getting user information. They are not related directly to auth() * The following functions are used for getting user information. They are not related directly to auth()
*/ */
function get_userdata_from_id($userid, $db) function get_userdata_from_id($userid)
{ {
global $db;
$sql = "SELECT * FROM ".USERS_TABLE." WHERE user_id = $userid"; $sql = "SELECT * FROM ".USERS_TABLE." WHERE user_id = $userid";
if(!$result = $db->sql_query($sql)) if(!$result = $db->sql_query($sql))
{ {
@ -65,7 +68,10 @@ function get_userdata_from_id($userid, $db)
} }
} }
function get_userdata($username, $db) { function get_userdata($username) {
global $db;
$sql = "SELECT * FROM ".USERS_TABLE." WHERE username = '$username' AND user_level != ".DELETED; $sql = "SELECT * FROM ".USERS_TABLE." WHERE username = '$username' AND user_level != ".DELETED;
if(!$result = $db->sql_query($sql)) if(!$result = $db->sql_query($sql))
{ {

16
phpBB/includes/functions.php
View file

@ -22,8 +22,10 @@
* *
***************************************************************************/ ***************************************************************************/
function get_db_stat($db, $mode) function get_db_stat($mode)
{ {
global $db;
switch($mode){ switch($mode){
case 'postcount': case 'postcount':
$sql = 'SELECT count(*) AS total FROM '.POSTS_TABLE; $sql = 'SELECT count(*) AS total FROM '.POSTS_TABLE;
@ -73,8 +75,9 @@ function get_db_stat($db, $mode)
} }
function make_jumpbox($db) function make_jumpbox()
{ {
global $db;
global $l_jumpto, $l_noforums, $l_nocategories; global $l_jumpto, $l_noforums, $l_nocategories;
$sql = "SELECT c.* $sql = "SELECT c.*
@ -157,8 +160,10 @@ function language_select($default, $name="language", $dirname="language/")
return $lang_select; return $lang_select;
} }
function theme_select($default, $db) function theme_select($default)
{ {
global $db;
$sql = "SELECT theme_id, theme_name FROM ".THEMES_TABLE." ORDER BY theme_name"; $sql = "SELECT theme_id, theme_name FROM ".THEMES_TABLE." ORDER BY theme_name";
if($result = $db->sql_query($sql)) if($result = $db->sql_query($sql))
{ {
@ -337,8 +342,11 @@ function tz_select($default)
return($tz_select); return($tz_select);
} }
function validate_username(&$username, $db) function validate_username(&$username)
{ {
global $db;
$username = trim($username); $username = trim($username);
$username = strip_tags($username); $username = strip_tags($username);
$username = htmlspecialchars($username); $username = htmlspecialchars($username);

6
phpBB/includes/page_header.php
View file

@ -96,7 +96,7 @@ switch($pagetype)
"jumpbox" => "jumpbox.tpl", "jumpbox" => "jumpbox.tpl",
"footer" => "viewforum_footer.tpl")); "footer" => "viewforum_footer.tpl"));
$jumpbox = make_jumpbox($db); $jumpbox = make_jumpbox();
$template->assign_vars(array("JUMPBOX_LIST" => $jumpbox, $template->assign_vars(array("JUMPBOX_LIST" => $jumpbox,
"JUMPBOX_ACTION" => "viewforum.".$phpEx, "JUMPBOX_ACTION" => "viewforum.".$phpEx,
"SELECT_NAME" => POST_FORUM_URL)); "SELECT_NAME" => POST_FORUM_URL));
@ -114,7 +114,7 @@ switch($pagetype)
"body" => "viewtopic_body.tpl", "body" => "viewtopic_body.tpl",
"jumpbox" => "jumpbox.tpl", "jumpbox" => "jumpbox.tpl",
"footer" => "viewtopic_footer.tpl")); "footer" => "viewtopic_footer.tpl"));
$jumpbox = make_jumpbox($db); $jumpbox = make_jumpbox();
$template->assign_vars(array("JUMPBOX_LIST" => $jumpbox, $template->assign_vars(array("JUMPBOX_LIST" => $jumpbox,
"JUMPBOX_ACTION" => "viewforum.".$phpEx, "JUMPBOX_ACTION" => "viewforum.".$phpEx,
"SELECT_NAME" => POST_FORUM_URL)); "SELECT_NAME" => POST_FORUM_URL));
@ -134,7 +134,7 @@ switch($pagetype)
"body" => "viewonline_body.tpl", "body" => "viewonline_body.tpl",
"jumpbox" => "jumpbox.tpl", "jumpbox" => "jumpbox.tpl",
"footer" => "viewonline_footer.tpl")); "footer" => "viewonline_footer.tpl"));
$jumpbox = make_jumpbox($db); $jumpbox = make_jumpbox();
$template->assign_vars(array("TOTAL_POSTS" => $total_posts, $template->assign_vars(array("TOTAL_POSTS" => $total_posts,
"TOTAL_USERS" => $total_users, "TOTAL_USERS" => $total_users,
"POST_USER_URL" => POST_USERS_URL, "POST_USER_URL" => POST_USERS_URL,

8
phpBB/index.php
View file

@ -37,12 +37,12 @@ init_userprefs($userdata);
// //
//nl2br(var_dump($userdata)); //nl2br(var_dump($userdata));
$total_posts = get_db_stat($db, 'postcount'); $total_posts = get_db_stat('postcount');
$total_users = get_db_stat($db, 'usercount'); $total_users = get_db_stat('usercount');
$newest_userdata = get_db_stat($db, 'newestuser'); $newest_userdata = get_db_stat('newestuser');
$newest_user = $newest_userdata["username"]; $newest_user = $newest_userdata["username"];
$newest_uid = $newest_userdata["user_id"]; $newest_uid = $newest_userdata["user_id"];
$users_browsing = get_db_stat($db, "usersonline") . " Users "; $users_browsing = get_db_stat("usersonline") . " Users ";
if(empty($viewcat)) if(empty($viewcat))
{ {

2
phpBB/profile.php
View file

@ -51,7 +51,7 @@ switch($mode)
error_die(GENERAL_ERROR, $l_nouserid); error_die(GENERAL_ERROR, $l_nouserid);
} }
} }
$profiledata = get_userdata_from_id($HTTP_GET_VARS[POST_USERS_URL], $db); $profiledata = get_userdata_from_id($db, $HTTP_GET_VARS[POST_USERS_URL]);
// Calculate the number of days this user has been a member ($memberdays) // Calculate the number of days this user has been a member ($memberdays)
// Then calculate their posts per day // Then calculate their posts per day

6
phpBB/viewonline.php
View file

@ -36,9 +36,9 @@ init_userprefs($userdata);
// End session management // End session management
// //
$total_posts = get_db_stat($db, 'postcount'); $total_posts = get_db_stat('postcount');
$total_users = get_db_stat($db, 'usercount'); $total_users = get_db_stat('usercount');
$newest_userdata = get_db_stat($db, 'newestuser'); $newest_userdata = get_db_stat('newestuser');
$newest_user = $newest_userdata["username"]; $newest_user = $newest_userdata["username"];
$newest_uid = $newest_userdata["user_id"]; $newest_uid = $newest_userdata["user_id"];