Version 2.1.7

This commit is contained in:
Neo committed 2025-12-19 00:21:15 -08:00
1 parent 0eecc172d9
commit f73f8bff6d
941 files changed
+215301 -103093

No files matched your search

+172 -102
View File
@@ -2,16 +2,28 @@
/*
+--------------------------------------------------------------------------
| Invision Power Board v2.0.0
| Invision Power Board 2.1.7
| =============================================
| by Matthew Mecham
| (c) 2001 - 2004 Invision Power Services, Inc.
| (c) 2001 - 2005 Invision Power Services, Inc.
| http://www.invisionpower.com
| =============================================
| Web: http://www.invisionboard.com
| Time: Tue, 21 Sep 2004 16:34:28 GMT
| Release: 150aa7a702c3c8b6f6eb90ad49305d2f
| http://www.ibresource.ru/products/invisionpowerboard/
| Time: Tuesday 18th of July 2006 05:56:00 PM
| Release: 52f408a29988b02f45b5e6f4ba5af0ae
| Licence Info: http://www.invisionboard.com/?license
| http://www.ibresource.ru/license
+---------------------------------------------------------------------------
| INVISION POWER BOARD IS NOT FREE / OPEN SOURCE!
+---------------------------------------------------------------------------
| INVISION POWER BOARD ÍÅ ßÂËßÅÒÑß ÁÅÑÏËÀÒÍÛÌ ÏÐÎÃÐÀÌÌÍÛÌ ÎÁÅÑÏÅ×ÅÍÈÅÌ!
| Ïðàâà íà ÏÎ ïðèíàäëåæàò Invision Power Services
| Ïðàâà íà ïåðåâîä IBResource (http://www.ibresource.ru)
+---------------------------------------------------------------------------
| > $Date: 2006-02-02 17:23:13 +0000 (Thu, 02 Feb 2006) $
| > $Revision: 133 $
| > $Author: bfarber $
+---------------------------------------------------------------------------
|
| > MySQL DB Queries abstraction module
@@ -34,7 +46,7 @@ class sql_queries extends db_driver
// Set up...
/*========================================================================*/
function sql_queries( $obj )
function sql_queries( &$obj )
{
$this->db = &$obj;
@@ -48,17 +60,24 @@ class sql_queries extends db_driver
/*========================================================================*/
# NEW: 2.1 (a5)
function general_get_by_display_name( $a )
{
return "SELECT id, members_display_name, name, email, mgroup, member_login_key, ip_address, login_anonymous
FROM ".SQL_PREFIX."members
WHERE LOWER(members_display_name)='{$a['members_display_name']}'";
}
function forums_get_active_users( $a )
{
# forums.php
return "SELECT s.member_id, s.member_name, s.member_group, s.login_type, s.location, t.forum_id
return "SELECT s.member_id, s.member_name, s.member_group, s.id, s.login_type, s.location, s.running_time, t.forum_id
FROM ".SQL_PREFIX."sessions s
LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=s.in_topic)
WHERE (s.in_forum={$a['fid']} OR t.forum_id={$a['fid']})
LEFT JOIN ".SQL_PREFIX."topics t ON ( t.tid=s.location_1_id)
WHERE s.location_2_type='forum' AND (s.location_2_id={$a['fid']} OR t.forum_id={$a['fid']})
AND s.running_time > {$a['time']}
AND s.in_error != 1
ORDER BY s.running_time DESC";
AND s.in_error=0";
}
function forums_get_replied_topics( $a )
@@ -75,7 +94,7 @@ class sql_queries extends db_driver
LEFT JOIN ".SQL_PREFIX."posts p ON (p.topic_id=t.tid AND p.author_id={$a['mid']})
WHERE t.forum_id={$a['fid']}
AND {$a['query']} AND p.new_topic=0
ORDER BY pinned desc,{$a['topic_sort']} {$a['sort_key']} {$a['r_sort_by']}
ORDER BY t.pinned desc,{$a['topic_sort']} {$a['sort_key']} {$a['r_sort_by']}
LIMIT {$a['limit_a']}, {$a['limit_b']}";
}
@@ -94,7 +113,7 @@ class sql_queries extends db_driver
return "SELECT p.*,
m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size
me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size, m.members_display_name
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."members m ON (p.author_id=m.id)
LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
@@ -108,7 +127,7 @@ class sql_queries extends db_driver
return "SELECT p.*,
m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size,
me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size, m.members_display_name,
pc.*
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."members m ON (p.author_id=m.id)
@@ -122,14 +141,14 @@ class sql_queries extends db_driver
{
# topics.php
return "SELECT s.member_id, s.member_name, s.member_group, s.login_type, s.location
return "SELECT s.member_id, s.member_name, s.member_group, s.id, s.login_type, s.location, s.running_time
FROM ".SQL_PREFIX."sessions s
WHERE s.in_topic={$a['tid']}
WHERE s.location_1_type='topic' AND s.location_1_id={$a['tid']}
AND s.running_time > {$a['time']}
AND s.in_error != 1
ORDER BY s.running_time DESC";
AND s.in_error=0";
}
# Deleted
function topics_replace_topic_read( $a )
{
# topics.php
@@ -137,23 +156,13 @@ class sql_queries extends db_driver
return "REPLACE INTO ".SQL_PREFIX."topics_read SET read_tid={$a['tid']},read_mid={$a['mid']},read_date={$a['date']}";
}
function session_load_member( $a )
{
return "SELECT m.id, m.name, m.mgroup, m.member_login_key, m.email, m.restrict_post, m.view_sigs, m.view_avs, m.view_pop, m.view_img, m.auto_track,
m.mod_posts, m.language, m.skin, m.new_msg, m.show_popup, m.msg_total, m.time_offset, m.posts, m.joined, m.last_post, m.subs_pkg_chosen,
m.ignored_users, m.login_anonymous, m.last_visit, m.last_activity, m.dst_in_use, m.view_prefs, m.org_perm_id, m.mgroup_others, m.temp_ban, m.sub_end
FROM ".SQL_PREFIX."members m
WHERE m.id={$a['mid']}";
}
function post_topic_tracker( $a )
{
#post
return "SELECT tr.trid, tr.topic_id, m.name, m.email, m.id, m.email_full, m.language, m.last_activity, t.title, t.forum_id
return "SELECT tr.trid, tr.topic_id, m.name, m.email, m.id, m.email_full, m.language, m.org_perm_id, m.mgroup, m.mgroup_others, m.last_activity, t.title, t.forum_id, t.approved
FROM ".SQL_PREFIX."tracker tr, ".SQL_PREFIX."topics t,".SQL_PREFIX."members m
WHERE tr.topic_id='{$a['tid']}'
AND tr.member_id=m.id
@@ -163,7 +172,8 @@ class sql_queries extends db_driver
}
function post_forum_tracker( $a )
#REMOVED
/*function post_forum_tracker( $a )
{
#post
@@ -174,7 +184,7 @@ class sql_queries extends db_driver
AND m.mgroup=g.g_id
AND m.id <> {$a['mid']}
AND ( ( tr.forum_track_type='delayed' AND m.last_activity < {$a['last_post']} ) OR tr.forum_track_type='immediate' )";
}
}*/
function post_get_quoted( $a )
@@ -191,8 +201,8 @@ class sql_queries extends db_driver
function msg_get_msg_archive( $a )
{
return "SELECT m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
g.g_id, g.g_title, g.g_icon, g.g_dohtml,
return "SELECT m.id,m.name, m.members_disable_pm, m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
g.g_id, g.g_title, g.g_icon, g.g_dohtml, m.members_display_name,
me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size,
mt.*, msg.*
FROM ".SQL_PREFIX."message_topics mt
@@ -206,8 +216,8 @@ class sql_queries extends db_driver
function msg_get_msg_to_show( $a )
{
return "SELECT m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
g.g_id, g.g_title, g.g_icon, g.g_dohtml,
return "SELECT m.id,m.name,m.members_disable_pm,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
g.g_id, g.g_title, g.g_icon, g.g_dohtml, m.members_display_name,
me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size,
mt.*, msg.*
FROM ".SQL_PREFIX."message_topics mt
@@ -220,67 +230,72 @@ class sql_queries extends db_driver
function msg_get_saved_msg( $a )
{
return "SELECT m.id,m.name, mt.*, msg.*
return "SELECT m.id, m.name, m.members_display_name, m.members_disable_pm, mt.*, msg.*
FROM ".SQL_PREFIX."message_topics mt
LEFT JOIN ".SQL_PREFIX."message_text msg ON (mt.mt_msg_id=msg.msg_id)
LEFT JOIN ".SQL_PREFIX."members m ON (mt.mt_to_id=m.id)
WHERE mt.mt_id={$a['msgid']} AND mt.mt_owner_id={$a['mid']}";
}
#IPB 2.1: Changed m.members_display_name AND LOWER(m.members_display_name)
function msg_get_cc_users( $a )
{
function msg_get_cc_users( $a )
{
return "SELECT m.mgroup_others, m.id, m.name, m.msg_total, m.view_pop, m.email_pm, m.language, m.email, me.vdirs, g.g_max_messages, g.g_use_pm FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g
LEFT JOIN ".SQL_PREFIX."member_extra me ON (m.id=me.id)
WHERE LOWER(m.name) IN (".implode(",",$a['name_array']).")
AND m.mgroup=g.g_id";
}
return "SELECT m.mgroup_others, m.id, m.name, m.members_disable_pm, m.members_display_name, m.msg_total, m.view_pop, m.email_pm, m.language, m.email, me.vdirs, g.g_max_messages, g.g_use_pm FROM ".SQL_PREFIX."members m
INNER JOIN ".SQL_PREFIX."groups g ON (m.mgroup=g.g_id)
LEFT JOIN ".SQL_PREFIX."member_extra me ON (m.id=me.id)
WHERE LOWER(m.members_display_name) IN (".implode(",",$a['name_array']).")";
}
function msg_get_cc_blocked( $a )
{
return "SELECT m.name, c.allow_msg
return "SELECT m.name, m.members_display_name, m.members_disable_pm, c.allow_msg
FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."contacts c
WHERE contact_id={$a['mid']}
AND member_id IN (".implode(",",$a['cc_array']).") AND m.id=c.member_id";
}
# Changed: mem.members_display_name as from_name
function msg_get_sent_list( $a )
{
return "SELECT mem.name as from_name, mem.id as from_id, mt.*
return "SELECT mem.members_display_name as from_name, mem.id as from_id, mt.*, msg.msg_id, msg.msg_cc_users
FROM ".SQL_PREFIX."message_topics mt
LEFT JOIN ".SQL_PREFIX."members mem ON ( mt.mt_to_id=mem.id )
WHERE mt.mt_owner_id={$a['mid']} AND mt.mt_from_id={$a['mid']} AND mt.mt_vid_folder='{$a['vid']}'
LEFT JOIN ".SQL_PREFIX."message_text msg ON ( mt.mt_msg_id=msg.msg_id )
WHERE mt.mt_owner_id={$a['mid']} AND (mt.mt_from_id={$a['mid']} OR mt.mt_to_id={$a['mid']}) AND mt.mt_vid_folder='{$a['vid']}'
ORDER BY {$a['sort']} LIMIT {$a['limita']}, {$a['limitb']}";
}
# Changed: mem.members_display_name as from_name
function msg_get_folder_list( $a )
{
return "SELECT mt.*,mem.name as from_name, mem.id as from_id
return "SELECT mt.*,mem.members_display_name as from_name, mem.id as from_id
FROM ".SQL_PREFIX."message_topics mt
LEFT JOIN ".SQL_PREFIX."members mem ON ( mt.mt_from_id=mem.id )
WHERE mt.mt_owner_id={$a['mid']} AND mt.mt_to_id={$a['mid']} AND mt.mt_vid_folder='{$a['vid']}'
ORDER BY mt.{$a['sort']} LIMIT {$a['limita']}, {$a['limitb']}";
ORDER BY {$a['sort']} LIMIT {$a['limita']}, {$a['limitb']}";
}
# Changed: mp.members_display_name as to_name
function msg_get_tracking( $a )
{
return "SELECT msg.*, mt.*, mp.name as to_name, mp.id as memid
return "SELECT msg.*, mt.*, mp.members_display_name as to_name, mp.id as memid
FROM ".SQL_PREFIX."message_topics mt
LEFT JOIN ".SQL_PREFIX."message_text msg ON ( mt.mt_msg_id=msg.msg_id )
LEFT JOIN ".SQL_PREFIX."members mp ON (mt.mt_to_id=mp.id)
WHERE mt.mt_from_id={$a['mid']} AND mt.mt_tracking=1";
}
# Updated (msg_get_new_pm_notification) in v2.1 [changed LIMIT ADDED m.members_display_name ]
function msg_get_new_pm_notification( $a )
{
return "SELECT m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,
m.warn_level, m.warn_lastwarn,
m.warn_level, m.warn_lastwarn, m.members_display_name,
me.*,
g.g_id, g.g_title, g.g_icon, g.g_dohtml, mt.*, msg.*
FROM ".SQL_PREFIX."message_topics mt
@@ -288,17 +303,17 @@ class sql_queries extends db_driver
LEFT JOIN ".SQL_PREFIX."members m ON (mt.mt_from_id=m.id)
LEFT JOIN ".SQL_PREFIX."member_extra me ON (mt.mt_from_id=me.id)
LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
WHERE mt.mt_owner_id={$a['mid']} AND mt.mt_vid_folder='in' ORDER BY mt_date DESC LIMIT 1";
WHERE mt.mt_owner_id={$a['mid']} AND mt.mt_vid_folder='in' ORDER BY mt_date DESC LIMIT {$a['limit_a']},1";
}
function ucp_tracker_prune( $a )
{
return "SELECT tr.trid FROM ".SQL_PREFIX."tracker tr, ".SQL_PREFIX."topics t WHERE t.tid=tr.topic_id AND t.last_post < {$a['time']}";
}
# Changed
function profile_get_all( $a )
{
return "SELECT m.*, me.*, s.running_time, s.location as sesslocation, s.in_forum, s.in_topic FROM ".SQL_PREFIX."members m
return "SELECT m.*, me.*, s.location_1_id, s.location_2_id, s.location_1_type, s.location_2_type, s.running_time, s.location as sesslocation FROM ".SQL_PREFIX."members m
LEFT JOIN ".SQL_PREFIX."sessions s ON (s.member_id=m.id)
LEFT JOIN ".SQL_PREFIX."member_extra me ON ( me.id=m.id )
WHERE m.id={$a['mid']}";
@@ -353,7 +368,7 @@ class sql_queries extends db_driver
FROM ".SQL_PREFIX."members m
LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
WHERE m.id IN(".implode(',', $a['member_ids']).")
ORDER BY m.name";
ORDER BY m.members_display_name";
}
function stats_get_all_members_groups( $a )
@@ -361,13 +376,13 @@ class sql_queries extends db_driver
return "SELECT m.*, me.*
FROM ".SQL_PREFIX."members m
LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
WHERE mgroup IN (".implode( ',', $a['group_ids'] ).")
ORDER BY m.name";
WHERE m.mgroup IN (".implode( ',', $a['group_ids'] ).")
ORDER BY m.members_display_name";
}
function stats_get_todays_posters( $a )
{
return "SELECT COUNT(*) as tpost, m.id, m.name, m.joined, m.posts
return "SELECT COUNT(*) as tpost, m.id, m.name, m.members_display_name, m.joined, m.posts
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id )
LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=p.topic_id)
@@ -378,14 +393,16 @@ class sql_queries extends db_driver
function ucp_mod_ip_tool_one( $a )
{
return "SELECT pid, t.forum_id
FROM ".SQL_PREFIX."posts p, ".SQL_PREFIX."topics t
WHERE t.tid=p.topic_id and p.queued <> 1 AND t.forum_id IN({$a['the_forums']}) AND {$a['sql']}";
return "SELECT p.pid, t.forum_id
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."topics t ON(t.tid=p.topic_id)
WHERE t.forum_id IN({$a['the_forums']}) AND {$a['sql']}";
}
# Changed: added m.members_display_name
function ucp_get_all_announcements( $a )
{
return "SELECT a.*, m.id, m.name
return "SELECT a.*, m.id, m.name, m.members_display_name
FROM ".SQL_PREFIX."announcements a
LEFT JOIN ".SQL_PREFIX."members m on (a.announce_member_id=m.id)
ORDER BY announce_end DESC";
@@ -417,22 +434,47 @@ class sql_queries extends db_driver
ORDER BY f.id, t.last_post DESC";
}
# Changed, removed group stuff
function mlist_count( $a )
{
# Attempt to optimize on the fly...
$query_bit_1 = '';
$query_bit_2 = '';
if ( strstr( $a['query'], 'p.field_' ) )
{
$query_bit_2 = "LEFT JOIN ".SQL_PREFIX."pfields_content p ON (p.member_id=m.id)";
}
if ( strstr( $a['query'], 'me.' ) )
{
$query_bit_1 = "LEFT JOIN ".SQL_PREFIX."member_extra me ON me.id=m.id";
}
if ( $a['query'] )
{
$a['query'] = 'WHERE '.$a['query'];
}
return "SELECT COUNT(*) as total_members FROM ".SQL_PREFIX."members m
LEFT JOIN ".SQL_PREFIX."member_extra me ON me.id=m.id
LEFT JOIN ".SQL_PREFIX."pfields_content p ON (p.member_id=m.id)
LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
WHERE g.g_hide_from_list <> 1 {$a['query']}";
{$query_bit_1}
{$query_bit_2}
{$a['query']}";
}
# Changed, removed group stuff
function mlist_get_members( $a )
{
return "SELECT m.*,me.*,p.*,g.g_hide_from_list,g.g_id FROM ".SQL_PREFIX."members m
if ( $a['query'] )
{
$a['query'] = 'WHERE '.$a['query'];
}
return "SELECT m.*,me.*,p.* FROM ".SQL_PREFIX."members m
LEFT JOIN ".SQL_PREFIX."member_extra me ON me.id=m.id
LEFT JOIN ".SQL_PREFIX."pfields_content p ON (p.member_id=m.id)
LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
WHERE g.g_hide_from_list <> 1 {$a['query']}
{$a['query']}
ORDER BY m.{$a['sort']} {$a['order']}
LIMIT {$a['limit_a']}, {$a['limit_b']}";
}
@@ -450,11 +492,11 @@ class sql_queries extends db_driver
function buddy_posts_last_visit( $a )
{
return "SELECT COUNT(*) as posts
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
WHERE p.post_date > {$a['last_visit']}
AND p.queued <> 1 AND t.forum_id IN({$a['forum_string']})";
return "SELECT COUNT(*) as posts
FROM ".SQL_PREFIX."posts p USE INDEX (topic_id)
LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
WHERE t.forum_id IN({$a['forum_string']})
AND p.queued=0 AND p.post_date > {$a['last_visit']}";
}
function generic_get_all_member( $a )
@@ -476,12 +518,14 @@ class sql_queries extends db_driver
return "UPDATE ".SQL_PREFIX."topics SET title=CONCAT('{$a['pre']}', title, '{$a['end']}') WHERE tid IN(".implode( ",", $a['tids'] ).")";
}
# UPDATE 2.1
function mod_func_get_last_post( $a )
{
return "SELECT p.post_date, p.topic_id, p.author_id, p.author_name, p.pid, t.forum_id
return "SELECT p.post_date, p.topic_id, p.author_id, p.author_name, p.pid, t.forum_id, m.id, m.members_display_name
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
WHERE topic_id={$a['tid']} and queued <> 1
LEFT JOIN ".SQL_PREFIX."members m ON (p.author_id=m.id)
WHERE topic_id={$a['tid']} and queued=0
ORDER BY pid DESC LIMIT 0,1";
}
@@ -511,25 +555,25 @@ class sql_queries extends db_driver
WHERE v.new_reg=1
AND v.coppa_user <> 1
AND v.entry_date < {$a['less_than']}
AND lost_pass <> 1";
AND v.lost_pass <> 1";
}
function search_get_all_user_count( $a )
{
return "SELECT count(*) as count
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
WHERE p.queued <> 1 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}";
LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid AND t.approved=1)
WHERE p.queued=0 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}";
}
function search_get_all_user_query( $a )
{
return "SELECT p.*, t.*, t.posts as topic_posts, t.title as topic_title, m.*, me.*
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid AND t.approved=1)
LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id)
LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=p.author_id)
WHERE p.queued <> 1 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}
WHERE p.queued=0 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}
ORDER BY post_date DESC";
}
@@ -540,7 +584,7 @@ class sql_queries extends db_driver
LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id)
LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=p.author_id)
WHERE p.queued <> 1 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}
WHERE p.queued=0 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}
ORDER BY post_date DESC
LIMIT 0,10";
}
@@ -576,16 +620,44 @@ class sql_queries extends db_driver
WHERE t.tid={$a['tid']} and p.tid=t.tid and t.forum_id=f.id";
}
/**
* contact_member_report_get_mods
* Changed: 2.1.0.BETA4
* Added: m.members_disable_pm
*
*/
function contact_member_report_get_mods( $a )
{
return "SELECT m.id, m.name, m.email, mod.member_id FROM ".SQL_PREFIX."moderators mod, ".SQL_PREFIX."members m WHERE mod.forum_id='{$a['fid']}' and mod.member_id=m.id";
return "SELECT m.id, m.members_display_name as name, m.members_disable_pm, m.email, m.mgroup, moderator.member_id, moderator.group_id
FROM ".SQL_PREFIX."moderators moderator, ".SQL_PREFIX."members m
WHERE moderator.forum_id={$a['fid']}
AND (moderator.member_id=m.id OR moderator.group_id=m.mgroup)";
}
/**
* contact_member_report_get_cpaccess
* Changed: 2.1.0.BETA4
* Added: m.members_disable_pm
*
*/
function contact_member_report_get_cpaccess( $a )
{
return "SELECT m.id, m.name, m.email FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE g.g_access_cp=1 AND m.mgroup=g.g_id";
return "SELECT m.id, m.members_display_name as name, m.email, m.members_disable_pm FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE g.g_access_cp=1 AND m.mgroup=g.g_id";
}
/**
* contact_member_report_get_supmod
* Changed: 2.1.0.BETA4
* Added: m.members_disable_pm
*
*/
function contact_member_report_get_supmod( $a )
{
return "SELECT m.id, m.members_display_name as name, m.email, m.members_disable_pm FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE g.g_is_supmod=1 AND m.mgroup=g.g_id";
}
function print_page_get_members( $a )
{
return "SELECT g.*, m.* FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE m.id in ({$a['mem_ids']}) AND m.mgroup=g.g_id";
@@ -594,12 +666,12 @@ class sql_queries extends db_driver
function stats_who_posted( $a )
{
return "SELECT COUNT(p.pid) as pcount, p.author_id, p.author_name FROM ".SQL_PREFIX."posts p
WHERE p.topic_id={$a['tid']} AND queued <> 1 GROUP BY p.author_name ORDER BY pcount DESC";
WHERE p.topic_id={$a['tid']} AND queued=0 GROUP BY p.author_id ORDER BY pcount DESC";
}
function warn_get_data( $a )
{
return "SELECT l.*, p.id as punisher_id, p.name as punisher_name
return "SELECT l.*, p.id as punisher_id, p.members_display_name as punisher_name
FROM ".SQL_PREFIX."warn_logs l
LEFT JOIN ".SQL_PREFIX."members p ON ( p.id=l.wlog_addedby )
WHERE l.wlog_mid={$a['mid']} ORDER BY l.wlog_date DESC LIMIT {$a['limit_a']}, {$a['limit_b']}";
@@ -621,11 +693,11 @@ class sql_queries extends db_driver
function portal_get_monster_bitch( $a )
{
return "SELECT t.*, p.*, me.avatar_location, m.view_avs, me.avatar_size, me.avatar_type,
m.id as member_id, m.name as member_name, m.mgroup
m.id as member_id, m.members_display_name as member_name, m.mgroup
FROM ".SQL_PREFIX."topics t
LEFT JOIN ".SQL_PREFIX."members m ON (t.starter_id=m.id)
LEFT JOIN ".SQL_PREFIX."member_extra me on (m.id=me.id)
LEFT JOIN ".SQL_PREFIX."posts p ON (p.topic_id=t.tid AND p.new_topic=1)
LEFT JOIN ".SQL_PREFIX."posts p ON (t.topic_firstpost=p.pid)
WHERE t.forum_id IN (-1{$a['csite_article_forum']}) {$a['qe']}
AND t.approved=1 AND (t.moved_to IS NULL or t.moved_to='')
ORDER BY t.pinned DESC, t.start_date DESC
@@ -644,27 +716,25 @@ class sql_queries extends db_driver
function login_getmember( $a )
{
return "select id, name, email, mgroup, member_login_key, ip_address, login_anonymous
return "select id, name, members_display_name, members_created_remote, email, mgroup, member_login_key, ip_address, login_anonymous
from ".SQL_PREFIX."members
where LOWER(name)='{$a['username']}'";
}
function contact_member_report_get_supmod( $a )
{
return "SELECT m.id, m.name, m.email FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE g.g_is_supmod=1 AND m.mgroup=g.g_id";
}
function post_get_topic_review( $a )
{
return "SELECT p.*, m.mgroup
return "SELECT p.*, m.members_display_name, m.mgroup
FROM ".SQL_PREFIX."posts p
LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id)
WHERE topic_id={$a['tid']} and queued <> 1
WHERE topic_id={$a['tid']} and queued=0
ORDER BY pid DESC
LIMIT 0,10";
}
function post_forum_tracker_all( $a )
# REMOVED
/*function post_forum_tracker_all( $a )
{
#post
@@ -675,7 +745,7 @@ class sql_queries extends db_driver
AND m.id <> {$a['mid']}
AND m.allow_admin_mails=1
AND m.last_activity < {$a['last_post']}";
}
}*/
} // end class